Anand Doshi
b1bae1bde8
Merge branch 'develop'
2015-08-13 15:44:03 +05:30
Anand Doshi
bcfd4277f4
bumped to version 5.6.0
2015-08-13 16:14:03 +06:00
Anand Doshi
2b6915519f
[change-log]
2015-08-13 15:36:18 +05:30
Anand Doshi
5eb84352ec
Merge pull request #3868 from nabinhait/price_list_rate
...
[fix] Reset price list rate based on Pricing Rule type
2015-08-13 15:10:08 +05:30
Anand Doshi
1580bf9ca4
Merge pull request #3869 from rmehta/pricing-rule-layout
...
[minor] pricing rule layout
2015-08-13 15:08:54 +05:30
Rushabh Mehta
4c4c534dcd
[minor] pricing rule layout
2015-08-13 15:00:54 +05:30
Nabin Hait
0da11f1b10
[fix] Reset price list rate based on Pricing Rule type
2015-08-13 14:58:19 +05:30
Anand Doshi
cb4784c940
Merge pull request #3822 from neilLasrado/item-uom
...
Changed UOM validation for Item Master
2015-08-13 14:36:37 +05:30
Nabin Hait
4c8ee279f3
Merge branch 'bobzz-zone-patch-7' into develop
2015-08-13 14:15:45 +05:30
Nabin Hait
58aea1f819
minor fix
2015-08-13 14:15:27 +05:30
Nabin Hait
760bfb27d0
Merge branch 'patch-7' of https://github.com/bobzz-zone/erpnext into bobzz-zone-patch-7
2015-08-13 14:14:26 +05:30
Anand Doshi
c0c4e866be
Merge branch 'nabinhait-item_description' into develop
...
Conflicts:
erpnext/patches.txt
2015-08-13 13:40:33 +05:30
Anand Doshi
b16474e606
[minor] Reload Journal Entry Account
2015-08-13 13:38:22 +05:30
Rushabh Mehta
bbed8972c3
[minor] pincode label changed to postal code, #3770
2015-08-13 13:38:21 +05:30
Rushabh Mehta
35f94dfbc6
[patch] cleanup_journal_entry
2015-08-13 13:38:21 +05:30
Rushabh Mehta
832fa2e76b
[patch] cleanup_journal_entry
2015-08-13 13:38:21 +05:30
Rushabh Mehta
682ce24f8c
[patch] cleanup_journal_entry
2015-08-13 13:38:21 +05:30
Nabin Hait
9f02b08427
minor fix
2015-08-13 13:38:20 +05:30
Rushabh Mehta
2645980f62
[patch] cleanup_journal_entry
2015-08-13 13:38:20 +05:30
Anand Doshi
ae1a91835e
Merge pull request #3866 from nabinhait/fix3
...
[fix] fraction issue in gl entry
2015-08-13 13:35:57 +05:30
Anand Doshi
094755415a
Merge pull request #3867 from rmehta/salary-slip-fix
...
[fix] salary slip to consider disable rounded total, #3792
2015-08-13 13:35:02 +05:30
Anand Doshi
746eae4d1a
[minor] Reload Journal Entry Account
2015-08-13 12:52:13 +05:30
Rushabh Mehta
cdbb448f6c
[fix] salary slip to consider disable rounded total, #3792
2015-08-13 12:48:04 +05:30
Rushabh Mehta
907ea7dd8a
[minor] pincode label changed to postal code, #3770
2015-08-13 12:35:43 +05:30
Neil Trini Lasrado
9a73b7a319
Changed UOM validation for Item Master
2015-08-13 12:21:32 +05:30
Nabin Hait
2e54da2ea5
[fix] fraction issue in gl entry
2015-08-13 12:19:27 +05:30
Rushabh Mehta
7e4b93f48e
[patch] cleanup_journal_entry
2015-08-13 12:10:21 +05:30
Rushabh Mehta
b01cc1b449
[patch] cleanup_journal_entry
2015-08-13 11:54:04 +05:30
Rushabh Mehta
f738b951c5
[patch] cleanup_journal_entry
2015-08-13 11:50:51 +05:30
Anand Doshi
bb1679b74b
Merge pull request #3865 from nabinhait/fix3
...
minor fix
2015-08-13 11:48:47 +05:30
Nabin Hait
6ddcac7cee
minor fix
2015-08-13 11:47:35 +05:30
Rushabh Mehta
bcf7da6b1e
[patch] cleanup_journal_entry
2015-08-13 11:46:01 +05:30
Nabin Hait
c51d5ba5df
[patch] Update item description in Production Order based on item master
2015-08-13 11:39:45 +05:30
Anand Doshi
57ca765d9e
Merge pull request #3848 from rmehta/journal-entry-refactor
...
[refactor] added dynamic link in journal entry, #3847 , #3814
2015-08-13 11:39:13 +05:30
Anand Doshi
92e7d1f41d
Merge pull request #3855 from nabinhait/discount
...
discount percentage should not be reset to zero on applying price list
2015-08-13 11:39:03 +05:30
Rushabh Mehta
ed40542658
[fix] minor auto-select party type and add has_permission in whitelisted methods
2015-08-13 10:34:49 +05:30
Rushabh Mehta
207b3efed7
[fix] journal entry get_query
2015-08-12 15:18:35 +05:30
Rushabh Mehta
3131c732ff
[fix] capacity planning error
2015-08-12 12:29:16 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Nabin Hait
4a91c49e0d
discount percentage should not be reset to zero on applying price list
2015-08-11 18:16:10 +05:30
Anand Doshi
ba1f4263dd
Added Rohit Industries as sponsors for #3546
2015-08-11 17:05:17 +05:30
Anand Doshi
7d45929872
Merge pull request #3829 from dottenbr/customer-taxid
...
Tax ID added and Customer Details description updated
2015-08-11 12:33:32 +05:30
Rushabh Mehta
b70f871592
Merge pull request #3850 from dottenbr/patch-1
...
Update README.md
2015-08-11 10:15:42 +05:30
Rushabh Mehta
d58df13150
Merge pull request #3849 from dottenbr/phone-mandatory-removed
...
Phone removed from mandatory in Address
2015-08-11 10:03:28 +05:30
Dominik
4101a48869
Update README.md
2015-08-10 23:59:16 +05:30
Dominik
28eff7fb91
Phone removed from mandatory in Address
2015-08-10 20:22:21 +05:30
Nabin Hait
6dc40e9baf
Update accounts_controller.py
2015-08-10 19:18:39 +05:30
Nabin Hait
ac6d11eb3c
minor improvements
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
1c6eeb228f
Fixes in Stock Entry
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
b44f26d1ba
Fixed Max value for update FG Item in Production Order
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
8ea2f45713
Renamed update_fg_goods_based_on in Manufacturing Settings to backflush_raw_materials_based_on
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
dde65752b6
Fixed code to consider partial FG entry
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
845980c010
Added Feature - Update FG based on Material Transfer For Manufacturing
2015-08-10 19:14:43 +05:30
Rushabh Mehta
6f593130d0
Merge pull request #3823 from nabinhait/stock-entry-tax
...
Stock entry tax
2015-08-10 14:31:20 +05:30
Nabin Hait
52f3bfca73
change log and sponsors page
2015-08-10 14:07:45 +05:30
Nabin Hait
3c3a3ecea8
Additional Costs in Stock Entry
2015-08-10 14:07:45 +05:30
Nabin Hait
246e47e76e
[fix] Dashboard in customer / supplier
2015-08-10 14:07:02 +05:30
Nabin Hait
f6aad5ed2d
Distribute tax amount between items in stock entry
2015-08-10 14:07:01 +05:30
Nabin Hait
aa87931172
Show only active BOM in stock entry
2015-08-10 14:07:01 +05:30
Nabin Hait
fc155c7712
Added tax table in stock entry
2015-08-10 14:07:01 +05:30
Rushabh Mehta
47b5e6272d
Merge pull request #3844 from nabinhait/fix12
...
[fix] Made expense account non-mandatory in POS Profile
2015-08-10 13:16:39 +05:30
Rushabh Mehta
eae56cae54
Merge pull request #3843 from thecarly/patch-1
...
[minor] fixed typo
2015-08-10 13:13:00 +05:30
Nabin Hait
ea925d26a8
[fix] Made expense account non-mandatory in POS Profile
2015-08-10 12:57:05 +05:30
thecarly
56f5156f3c
[minor] fixed typo
2015-08-10 12:50:44 +05:30
Rushabh Mehta
ee069d47b5
Merge pull request #3797 from anandpdoshi/fix-missing-item-images
...
Rename old filenames for Item
2015-08-10 11:58:54 +05:30
Rushabh Mehta
6c83b6bddc
Merge pull request #3811 from rmehta/opportunity-customer
...
[minor] add close button in opportunity and project links in customer
2015-08-10 11:57:23 +05:30
Rushabh Mehta
815b460ddd
Merge pull request #3809 from nabinhait/journal_entry_fix
...
[fix] Party / Account Validation message against Invoice
2015-08-10 11:57:01 +05:30
Dominik
d1416542a0
Tax ID added and Customer Details description updated
...
Tax ID is a relatively generic descriptor for VAT (Value Added Tax) or any other countrie's tax identification system and should be required by most users of an ERP system. Since this removes the necessity to put the VAT into the Customer Description (not the ideal place to begin with) the description was updated and slimmed down.
2015-08-08 00:05:38 +05:30
Rushabh Mehta
69095e7285
[fix] website search
2015-08-07 15:48:53 +05:30
Rushabh Mehta
d6bdad7adf
[fix] [hot] total in time log batch
2015-08-06 15:46:42 +05:30
Rushabh Mehta
48cccca9af
[minor] add close button in opportunity and project links in customer
2015-08-06 15:37:01 +05:30
Nabin Hait
7c5124140e
[fix] Party / Account Validation message against Invoice
2015-08-06 12:58:53 +05:30
Nabin Hait
143f384986
Merge branch 'develop'
2015-08-05 19:14:37 +05:30
Nabin Hait
37fdc43c88
bumped to version 5.5.1
2015-08-05 19:44:37 +06:00
Nabin Hait
ceb761852e
Merge pull request #3807 from nabinhait/hotfix
...
[fix] fifo in stock ledger
2015-08-05 19:13:12 +05:30
Nabin Hait
65d8de36d0
Merge pull request #3804 from nabinhait/fix1
...
Fixes
2015-08-05 19:04:41 +05:30
Nabin Hait
8142cd2865
[fix] fifo in stock ledger
2015-08-05 18:57:37 +05:30
Anand Doshi
ed3a6cf748
[minor] removed print
2015-08-05 18:38:33 +05:30
Nabin Hait
2285eb7649
Merge pull request #3801 from bobzz-zone/patch-8
...
Update buying_controller.py
2015-08-05 16:15:02 +05:30
Nabin Hait
1648605950
[fix] Disabled OHADA system while fetching COA based on country
2015-08-05 15:56:05 +05:30
Nabin Hait
039154faa9
[fix] Asynchronus issue while fetching item description in Production Order
2015-08-05 15:56:05 +05:30
Rushabh Mehta
147acfd502
[fix] [mobile] abs url erpnext icon
2015-08-05 14:49:32 +05:30
bobzz-zone
b4c7bad33d
Update buying_controller.py
...
dont force change conversion factor
2015-08-05 11:30:12 +07:00
bobzz-zone
ff04bf6346
Update stock_entry.py
...
fixed for null expense account
2015-08-05 11:28:11 +07:00
Anand Doshi
aa5182bb9e
[fix] rename old filenames that start with FileData and fix missing Item images
2015-08-04 23:06:01 +05:30
Anand Doshi
329afe88f9
Merge branch 'develop'
2015-08-04 16:12:22 +05:30
Anand Doshi
ffa1e1c3bc
bumped to version 5.5.0
2015-08-04 16:42:22 +06:00
Anand Doshi
f6616b6cbd
[change-log]
2015-08-04 16:02:37 +05:30
Anand Doshi
d95b8e530a
Merge pull request #3794 from nabinhait/serial_no
...
[fix] serial no validation in return entry
2015-08-04 15:43:23 +05:30
Nabin Hait
0e1314c5b5
[fix] serial no validation in return entry
2015-08-04 15:22:48 +05:30
Anand Doshi
cc920a7e4c
Merge pull request #3780 from rmehta/service-product-bundle
...
[enhancement] make service type product bundle #3452
2015-08-04 15:05:05 +05:30
Rushabh Mehta
5bd394278d
[fix] test-case, warehouse mandatory for mix type product bundle
2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813
[enhancement] auto insert item price if missing, #3533
2015-08-04 14:48:52 +05:30
Rushabh Mehta
862a2eb975
[enhancement] make service type product bundle:
2015-08-04 14:47:45 +05:30
Anand Doshi
1385f20042
Merge pull request #3791 from rmehta/update-translations
...
[translations] updated
2015-08-04 14:45:58 +05:30
Anand Doshi
950250d444
Merge pull request #3793 from nabinhait/serial_no
...
Validate serial no in return entry with against document
2015-08-04 14:45:30 +05:30
Rushabh Mehta
63b98ec113
[translations] updated
2015-08-04 12:43:37 +05:30
Anand Doshi
4a0edd04c4
Merge pull request #3779 from nabinhait/fifo_stack
...
[fix] Get fifo rate only qty exists in batch
2015-08-04 12:26:42 +05:30
Nabin Hait
b7c0c55d61
Validate serial no in return entry with against document
2015-08-04 12:18:12 +05:30
Nabin Hait
232ad777c9
[fix][patch] Remove fifo stack entry if qty after transaction is zero via stock reconciliation
2015-08-04 11:40:38 +05:30
Nabin Hait
7edb951fdb
[fix] Get fifo rate only qty exists in batch
2015-08-04 11:09:14 +05:30
Nabin Hait
845bbe3e27
Update fix_invoice_outstanding.py
2015-08-04 10:48:05 +05:30
Nabin Hait
f7bf50d6fe
Merge pull request #3786 from nabinhait/fix4
...
[fix] Ignore if error coming while sending emails to system managers
2015-08-03 19:27:04 +05:30
Nabin Hait
374559bfad
[fix] Ignore if error coming while sending emails to system managers
2015-08-03 19:26:32 +05:30
Anand Doshi
e7c6605455
Merge pull request #3761 from nabinhait/fix1
...
Fixes
2015-08-03 19:20:31 +05:30
Nabin Hait
5bbe823106
[patch] Fix outstanding amount for original invoice for return entry
2015-08-03 19:19:11 +05:30
Nabin Hait
ad44b00f33
[patch] Fix outstanding amount for original invoice for return entry
2015-08-03 19:19:11 +05:30
Nabin Hait
893db7a5c3
Allow payment against invoice with negative outstanding
2015-08-03 19:18:22 +05:30
Nabin Hait
433cdc960d
Update outstanding in original invoice from return invoice
2015-08-03 19:18:22 +05:30
Nabin Hait
4f2832ecd2
[fix] Allow against purchase invoice against credit amount row
2015-08-03 19:18:22 +05:30
Nabin Hait
1755a5f298
[fix] get items from bom in material request
2015-08-03 19:18:21 +05:30
Nabin Hait
b3b059b0ea
[fix] payment reconciliation
2015-08-03 19:18:21 +05:30
Anand Doshi
d615d4fdcd
Merge pull request #3785 from nabinhait/fix3
...
[fix] newsletter list unique check
2015-08-03 19:18:07 +05:30
Anand Doshi
da77abc25b
Merge pull request #3767 from nabinhait/tax_calc
...
[fix] Tax calculation while discount applied on net total
2015-08-03 19:17:04 +05:30
Anand Doshi
7cb19f6e9f
Merge pull request #3783 from nabinhait/fix2
...
[fix] Get open SO in production planning tool
2015-08-03 19:14:24 +05:30
Anand Doshi
441a75b1d4
Merge pull request #3782 from rmehta/uom-fix
...
[fix] force stock_uom in item and stock ledger entry
2015-08-03 19:13:38 +05:30
Nabin Hait
03bccb81d8
[test case] Test case for discount amount on net total
2015-08-03 19:11:44 +05:30
Nabin Hait
1db0b6de0c
Patch to notify system managers if there are any wrong entries due to bug related to discount amount on net total
2015-08-03 19:11:44 +05:30
Nabin Hait
db53a789be
[fix] Tax calculation while discount applied on net total
2015-08-03 19:10:59 +05:30
Nabin Hait
c3e1f6bb96
[fix] newsletter list unique check
2015-08-03 19:09:05 +05:30
Anand Doshi
f2e5e7fc22
Merge pull request #3776 from nabinhait/account_type
...
Propogate root type and report type into children based on parent
2015-08-03 19:04:42 +05:30
Nabin Hait
541927d58a
[fix] Get open SO in production planning tool
2015-08-03 16:39:20 +05:30
Rushabh Mehta
b16b9cd7a0
[fix] force stock_uom in item and stock ledger entry
2015-08-03 16:13:33 +05:30
Nabin Hait
94f15fcec6
Propogate root type and report type into children based on parent
2015-08-03 11:17:07 +05:30
Anand Doshi
ba9dbb1b09
[minor] removed Link/DocType in Payment Period Based on Invoice Date
2015-08-03 11:05:45 +05:30
Nabin Hait
b7f2066250
Merge pull request #3768 from nabinhait/uom
...
[fix] UOM conversion factor in stock entry
2015-07-31 20:11:23 +05:30
Nabin Hait
b30c40ec8a
[fix] UOM conversion factor in stock entry
2015-07-31 19:48:57 +05:30
Rushabh Mehta
2f5587ab25
[fix] uom conversion factor in stock entry, #3734
2015-07-31 15:20:29 +05:30
Nabin Hait
75e9733283
Merge branch 'develop'
2015-07-30 16:47:49 +05:30
Nabin Hait
69588f57e7
bumped to version 5.4.2
2015-07-30 17:17:48 +06:00
Nabin Hait
88d8c164f7
Merge pull request #3757 from nabinhait/fix1
...
[hotfix] item search in production order
2015-07-30 16:46:27 +05:30
Nabin Hait
c330a49e9d
[hotfix] item search in production order
2015-07-30 16:45:58 +05:30
Nabin Hait
b75f5fd5ab
Merge branch 'develop'
2015-07-30 14:59:01 +05:30
Nabin Hait
6f5815838e
bumped to version 5.4.1
2015-07-30 15:29:01 +06:00
Nabin Hait
fe53651287
Merge pull request #3755 from nabinhait/fix1
...
repost stock for product bundle materials
2015-07-30 14:54:21 +05:30
Nabin Hait
d8546c4316
Fixed include holiday logic in leave calculation
2015-07-30 14:53:27 +05:30
Nabin Hait
17405d4130
repost stock for product bundle materials
2015-07-30 14:53:27 +05:30
Anand Doshi
2f443a5789
[hotfix] Item checkbox mandatory and removed Module Def Contacts
2015-07-30 14:44:43 +05:30
Nabin Hait
a5e11d7195
Merge branch 'develop'
2015-07-30 11:57:53 +05:30
Nabin Hait
3832e1f9be
bumped to version 5.4.0
2015-07-30 12:27:53 +06:00
Nabin Hait
67079d292c
Merge pull request #3725 from neilLasrado/test
...
Fixed test cases related to Time Logs
2015-07-30 11:51:26 +05:30
Nabin Hait
01a3a81f71
Merge pull request #3753 from nabinhait/return1
...
[fix] Actual tax amount should be negative while creating return entry
2015-07-30 11:50:45 +05:30
Nabin Hait
befa8d613f
Merge pull request #3750 from nabinhait/payreco
...
Minor fixes
2015-07-30 11:50:19 +05:30
Nabin Hait
9e26bcfeeb
[fix] Actual tax amount should be negative while creating return entry
2015-07-30 11:48:18 +05:30
Neil Trini Lasrado
f948fea3bf
simulate added to make_time_log in test_time_log
2015-07-29 18:48:58 +05:30
Neil Trini Lasrado
d851bd8d85
Fixed test cases related to Time Logs
2015-07-29 18:48:58 +05:30
Nabin Hait
30672c6b55
Merge pull request #3751 from neilLasrado/leave-application
...
Fixes in leave application
2015-07-29 18:47:59 +05:30
Neil Trini Lasrado
e73941b9cc
Fixes in leave application
2015-07-29 18:39:27 +05:30
Nabin Hait
f33787a706
[fix] Get serial nos using FIFO in Return Delivery Note
2015-07-29 18:08:10 +05:30
Nabin Hait
fcc4021e44
minor fix in payment reconciliation
2015-07-29 17:41:51 +05:30
Nabin Hait
3b67c89e0b
Merge pull request #3749 from nabinhait/changelog
...
Change log added
2015-07-29 16:41:57 +05:30
Nabin Hait
7364ebaff6
minor fix
2015-07-29 16:41:23 +05:30
Nabin Hait
fd8f34018d
Change log added
2015-07-29 16:38:02 +05:30
Nabin Hait
799fa09a23
Merge pull request #3748 from nabinhait/fix7
...
[fix][patch] Reload Leave Type
2015-07-29 16:37:29 +05:30
Nabin Hait
d1dc622914
[fix][patch] Reload Leave Type
2015-07-29 16:37:02 +05:30
Nabin Hait
8ce47862f9
Merge branch 'meatechsupport-develop' into develop
2015-07-29 16:15:27 +05:30
Nabin Hait
b24d2efc4b
[fix] Updated 'Include Holiday' in existing and default leave type records
2015-07-29 16:15:08 +05:30
Nabin Hait
a184fbfa66
Merge branch 'develop' of https://github.com/meatechsupport/erpnext into meatechsupport-develop
2015-07-29 16:05:47 +05:30
Nabin Hait
763821d57d
Merge pull request #3746 from nabinhait/get_item_details
...
[fix] Get item details based on selected company
2015-07-29 16:02:39 +05:30
Nabin Hait
a132767126
Merge pull request #3739 from nabinhait/packed-items
...
Packed items in sales invoice
2015-07-29 16:01:30 +05:30
Nabin Hait
453cc374d4
- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice
...
- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate
2015-07-29 15:59:57 +05:30
Nabin Hait
43e46a8506
Merge pull request #3733 from nabinhait/fix3
...
POS Profile: removed income account, cost center, territory and bank/cash account from mandatory
2015-07-29 15:57:05 +05:30
Nabin Hait
2c95130451
Merge pull request #3741 from nabinhait/sponsors
...
sponsors page updated
2015-07-29 15:54:58 +05:30
Nabin Hait
d46fb5eb8c
Merge pull request #3743 from rmehta/indicator-fix
...
[fix] indicators for sales order, purchase order #3736
2015-07-29 15:53:44 +05:30
Nabin Hait
e95c18a42d
Merge pull request #3744 from nabinhait/return
...
Sales / Purchase Return Improvements
2015-07-29 15:51:34 +05:30
Nabin Hait
18c2c54633
Merge pull request #3718 from rmehta/item-cleanup
...
[cleanup] yes/no selects changed to checks in Item
2015-07-29 15:49:54 +05:30
Nabin Hait
0edec9d25b
Merge pull request #3730 from nabinhait/fix1
...
minor fixes
2015-07-29 15:48:24 +05:30
Nabin Hait
15216fdd6f
[fix] Get item details based on selected company
2015-07-29 15:47:45 +05:30
Nabin Hait
9117af3077
[fix] Uncheck Is POS option while creating return entry against POS Invoice
2015-07-29 15:40:59 +05:30
Rushabh Mehta
92b6f76612
[fix] disable save in naming series
2015-07-29 15:17:30 +05:30
Rushabh Mehta
8bf0b89595
[minor] currency field in list view for item price
2015-07-29 14:55:48 +05:30
Nabin Hait
746c162055
Return status in listview for return entry
2015-07-29 14:54:33 +05:30
Nabin Hait
9eb9ccd785
Make Debit / Credit Note button in Purchase / Sales Invoice
2015-07-29 13:23:37 +05:30
Nabin Hait
1e046aa49a
Hide buttons for return entry
2015-07-29 13:16:37 +05:30
Nabin Hait
3ad26e4dd1
Fix Against Voucher in GL Entry for return against purchase invoice
2015-07-29 13:15:57 +05:30
Rushabh Mehta
2f3b097d63
[fix] indicators for sales order, purchase order #3736
2015-07-29 13:08:27 +05:30
Nabin Hait
c505cbc988
sponsors page updated
2015-07-29 12:34:18 +05:30
Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Anand Doshi
0e6f2474e8
[minor] removed trailing space in offer letter status
2015-07-29 11:27:02 +05:30
Meatechsupport
e102332f08
removed testcase
2015-07-28 19:03:30 +04:00
Meatechsupport
145227e4ec
Edited the Test case
2015-07-28 18:39:04 +04:00
Nabin Hait
18e033514e
Merge pull request #3679 from neilLasrado/freeze-customer
...
Added ability to freeze Customer/Supplier
2015-07-28 15:21:06 +05:30
Nabin Hait
26052df76e
POS Profile: removed income account, cost center, territory and bank-cash account from mandatory
2015-07-28 15:12:54 +05:30
Nabin Hait
b2f354a614
Merge pull request #3731 from nabinhait/fix2
...
[fix] Contact section visibility in Warranty Claim
2015-07-28 15:12:22 +05:30
Rushabh Mehta
49a59c075f
[minor] [setup-wizard] add check for sample data
2015-07-28 12:23:40 +05:30
Neil Trini Lasrado
ff3b220c79
Fixed gl_entry Validation
2015-07-28 12:23:14 +05:30
Neil Trini Lasrado
cc7cb2a70a
Allowed frozen_accounts_modifier to create records against frozen customer/supplier
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
79bf233734
Test Cases added to check if customer is frozen
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
3698b84d7c
Typo fixes in Supplier and Customer Document
2015-07-28 12:17:02 +05:30
Neil Trini Lasrado
3fbbb71afc
Added ability to freeze Customer/Supplier
2015-07-28 12:17:02 +05:30
Nabin Hait
a2f18ba794
[fix] Contact section visibility in Warranty Claim
2015-07-28 12:00:45 +05:30
Nabin Hait
9088432f10
Fetch default expense account and cost center from item if company matches, otherwise fetch from company master
2015-07-28 11:16:22 +05:30
Nabin Hait
c80059e10e
[fix] Ignore making SLE for opening stock reco with zero qty
2015-07-28 11:16:22 +05:30
Anand Doshi
8e8e9c61ca
[minor] Show description in Sales Order
2015-07-28 10:46:14 +05:30
Rushabh Mehta
424f0c7b84
[fix] [setup wizard] ignore fiscal year
2015-07-28 10:36:33 +05:30
Rushabh Mehta
aa5fb5e50e
[fix] [setup wizard] ignore if user is the primary user
2015-07-28 10:31:09 +05:30
Rushabh Mehta
08a60653ba
[fix] [setup wizard] ignore if user is the primary user
2015-07-28 09:22:36 +05:30
Meatechsupport
8b96fdac12
Indentation Error
...
realligned
2015-07-27 16:55:54 +04:00
Meatechsupport
e319598c51
IndentationError
...
alligned code
2015-07-27 16:42:22 +04:00
Nabin Hait
0c7fd6cd94
Merge branch 'develop'
2015-07-27 17:11:16 +05:30
Nabin Hait
0b5260acf0
bumped to version 5.3.1
2015-07-27 17:41:16 +06:00
Nabin Hait
d4be82cf9b
corrected typo
2015-07-27 17:09:54 +05:30
Nabin Hait
0166e9e47a
Merge pull request #3726 from nabinhait/fix1
...
minor fix
2015-07-27 17:09:38 +05:30
Nabin Hait
b71471fcb5
minor fix
2015-07-27 17:09:07 +05:30
Nabin Hait
7e8d7d05ef
Merge branch 'develop'
2015-07-27 15:55:57 +05:30
Nabin Hait
228ff87ea2
bumped to version 5.3.0
2015-07-27 16:25:56 +06:00
Nabin Hait
8d8655e1cd
Change log added
2015-07-27 15:54:39 +05:30
Meatechsupport
5c73bafeaa
Modifying the number of leave days calculation part.
...
we don't need to exclude the Holiday list (that comes in between) from the total number of leaves applied.
Add option in the leave type
added a field in the leave type to include and exclude the holidays from
the tolal leave applied days
Added the field
Added a field Include Holiday to leave Type doctype
changed the lable
changed the lable from "Include Holiday" to "Include holidays within leaves
as leaves"
Rearranged the function
moved holidays = leave_app.get_holidays() under if
Corrected 'total_leave_days' : flt(tot_days)-flt(holidays)
Adding test case
added the test case
Added test case
Added test case to test_leave_application.py
adding default value
added default value and corrected the syntax.
IndentationError
removed extra tabs after
2015-07-27 13:46:00 +04:00
Anand Doshi
14859faf17
[minor] Accounts Payable Report Type='Script Report'
2015-07-24 17:30:39 +05:30
Nabin Hait
2b7eda8135
Merge pull request #3683 from nabinhait/return
...
Sales / Purchase Return Enhancement
2015-07-24 16:53:01 +05:30
Anand Doshi
751d7ecd85
Merge pull request #3716 from tmimori/develop
...
Removed HTML from messages
2015-07-24 14:28:59 +05:30
Nabin Hait
6a09b3f7ef
Merge pull request #3702 from neilLasrado/capacity-planning
...
Global switch to set capacity planning in manufacturing
2015-07-24 14:26:28 +05:30
Nabin Hait
21897e3c52
Merge pull request #3714 from nabinhait/fix4
...
[fix] gross profit report
2015-07-24 14:25:35 +05:30
Nabin Hait
15b4f6310c
Merge pull request #3701 from neilLasrado/po
...
Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation
2015-07-24 14:25:13 +05:30
Tsutomu Mimori
196a0bc675
Amend for frappe/erpnext/pull/3716
2015-07-24 17:06:00 +09:00
Tsutomu Mimori
7c011985f0
Merge remote-tracking branch 'frappe/develop' into develop
2015-07-24 17:02:13 +09:00
Nabin Hait
3cf67a462b
Cleanup and test cases for serialized item
2015-07-24 13:26:54 +05:30
Nabin Hait
f061877b4f
[fix] Stock Entry permissions
2015-07-24 13:26:54 +05:30
Nabin Hait
04d244a360
Credit Note print format
2015-07-24 13:26:54 +05:30
Nabin Hait
b74999da82
[testcase] Testcase for return purchase invoice
2015-07-24 13:26:53 +05:30
Nabin Hait
061f7079ed
Test case for purchase return
2015-07-24 13:26:53 +05:30
Nabin Hait
246ed3f122
Test cases for sales return
2015-07-24 13:26:53 +05:30
Nabin Hait
6b25708b7a
Minor fixes
2015-07-24 13:26:53 +05:30
Nabin Hait
623ed57663
Removed Sales/Purchase Return option from Stock Entry
2015-07-24 13:26:53 +05:30
Nabin Hait
1d21842f68
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
2015-07-24 13:26:53 +05:30
Nabin Hait
ada485f096
Outgoing rate in Purchase Return based on reference/original Purchase Receipt rate
2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
8a9d41a92e
Modified Test Cases for Production Order
2015-07-24 13:18:45 +05:30
Neil Trini Lasrado
f965c5d203
now_datetime changed to nowdate
2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
21647974c4
Test Cases Added to Production Order
2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
9c3dca63fa
Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation
2015-07-24 13:14:56 +05:30
Tsutomu Mimori
c40b99be26
Merge remote-tracking branch 'frappe/develop' into develop
2015-07-23 22:10:40 +09:00
Tsutomu Mimori
982f4ae44d
Removed HTML from messages
2015-07-23 22:09:35 +09:00
Anand Doshi
9257413b68
[minor] Added 'Import Data' in sample data
2015-07-23 18:16:44 +05:30
Neil Trini Lasrado
c723c8b5aa
Disable Capacity Planning label changed to Disable Capacity Planning & Time Tracking in Manufacturing Settings
2015-07-23 17:43:27 +05:30
Neil Trini Lasrado
2771b7d828
Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings
2015-07-23 17:39:35 +05:30
Anand Doshi
75ebed815f
Merge pull request #3711 from nabinhait/budget
...
Validation on Account for assigning budget
2015-07-23 17:26:56 +05:30
Nabin Hait
975ef07c48
Merge pull request #3706 from neilLasrado/variant
...
Fetch Template Bom if no BOM is set against Item Variant in Production Order
2015-07-23 17:26:11 +05:30
Nabin Hait
f666535223
[fix] gross profit report
2015-07-23 17:08:44 +05:30
Nabin Hait
08fb19ac8c
Validation on Account for assigning budget
2015-07-23 16:59:43 +05:30
Anand Doshi
db9762be3f
Merge pull request #3712 from rmehta/setup-wizard-fix
...
[fix] contact name in setup wizard
2015-07-23 16:46:09 +05:30
Anand Doshi
03ae61afce
Merge pull request #3681 from rmehta/sample-data
...
[enhancement] update to setup wizard, added users, employees, sample data
2015-07-23 16:45:28 +05:30
Anand Doshi
1847b705fe
Merge pull request #3704 from nabinhait/fix2
...
[fix] SMS status and log
2015-07-23 16:45:00 +05:30
Anand Doshi
4a573a7e8b
Merge pull request #3709 from nabinhait/contacts
...
[cleanup] Party Type deleted
2015-07-23 16:41:36 +05:30
Nabin Hait
f74b9b06f7
Merge pull request #3708 from neilLasrado/material-request
...
Fetch items from Packing List if Exists in Sales Order while raising …
2015-07-23 15:21:50 +05:30
Nabin Hait
2820a8749f
Merge pull request #3710 from neilLasrado/stock-report
...
Opening Balance row added to Stock Ledger Report
2015-07-23 15:21:26 +05:30
Rushabh Mehta
41b4864f0c
Merge pull request #3713 from neilLasrado/manage-variants
...
Fixes for Item Variants
2015-07-23 15:01:28 +05:30
Neil Trini Lasrado
13df8a40ef
Validation added to prevent user to Manage Variants if Item Template is Unsaved. Prevented message stating variants updated while saving item template if there are no variants against that item Template
2015-07-23 12:46:59 +05:30
Rushabh Mehta
7cfa5f0508
[fix] contact name in setup wizard
2015-07-23 12:39:44 +05:30
Nabin Hait
bb274fce2e
[cleanup] Party Type deleted
2015-07-23 11:45:30 +05:30
Rushabh Mehta
fec61fe33e
[minor] fix report type for Accounts Payable
2015-07-23 10:39:13 +05:30
Neil Trini Lasrado
d0387f41df
Opening Balance row added to Stock Ledger Report
2015-07-22 18:44:59 +05:30
Neil Trini Lasrado
05d8174696
Fetch items from Packing List if Exists in Sales Order while raising Material Request against SO
2015-07-22 16:31:34 +05:30
Rushabh Mehta
ba02ce6adc
[docs] added description
2015-07-22 15:07:48 +05:30
Anand Doshi
886def0a69
[fix] convert Item and Item Grid images to absolute urls
2015-07-22 14:43:37 +05:30
Anand Doshi
7590aa2524
[minor] raise EmptyStockReconciliationItemsError when no change in any of the items
2015-07-22 14:43:36 +05:30
Neil Trini Lasrado
8b48ceab8c
Removed logic for get_item_details in Production Planning Tool, Used get_item_details function of Production Order instead
2015-07-22 12:42:21 +05:30
Nabin Hait
d900e12ae7
Change log for sms
2015-07-22 12:21:55 +05:30
Nabin Hait
098760f0e2
[fix] SMS status and log
2015-07-22 12:17:48 +05:30
Neil Trini Lasrado
cc431716ed
Fetch Template Bom if no BOM is set against Item Variant in Production Order
2015-07-22 12:13:47 +05:30
Anand Doshi
f5ea801b69
Merge pull request #3700 from nabinhait/fix1
...
[report] Letter Head option in General Ledger
2015-07-21 12:19:57 +05:30
Nabin Hait
e2b8ccf1bb
[report] Letter Head option in General Ledger report
2015-07-21 12:02:36 +05:30
Anand Doshi
f447c8258a
[minor] Newsletter Message should be mandatory
2015-07-20 16:10:04 +05:30
Nabin Hait
f78ffd84b4
Merge branch 'develop'
2015-07-20 15:22:10 +05:30
Nabin Hait
63d345c6ab
bumped to version 5.2.1
2015-07-20 15:52:10 +06:00
Anand Doshi
d0d1af2072
Merge pull request #3696 from nabinhait/fix1
...
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 13:27:47 +05:30
Anand Doshi
83694fd180
[minor] removed is_group from search fields of Account
2015-07-20 13:26:22 +05:30
Anand Doshi
fc353efeca
Merge pull request #3670 from neilLasrado/expense-claim
...
Default Expense Account added to Expense Claim Type.
2015-07-20 13:04:33 +05:30
Anand Doshi
16edf8b478
Merge pull request #3685 from nabinhait/fix6
...
[fix] Fetch debit/credit from reference journal entry
2015-07-20 13:00:10 +05:30
Nabin Hait
c9e4fbeda0
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 12:57:48 +05:30
Anand Doshi
46ae789f2f
Merge pull request #3682 from anandpdoshi/anand-july-17
...
Remove 'Stopped' banner in Sales Order, show ERPNext icon instead of 'ERPNext'
2015-07-20 12:57:17 +05:30
Anand Doshi
a9a284a5ae
Merge pull request #3693 from rmehta/close-task
...
[minor] close button for task and item not found error fix
2015-07-20 12:56:50 +05:30
Rushabh Mehta
823e88d5bd
[minor] close button for task and item not found error fix
2015-07-20 10:56:39 +05:30
Nabin Hait
1be94efcfa
[fix] Fetch debit/credit from reference journal entry
2015-07-17 17:25:52 +05:30
Anand Doshi
a5e9c71397
[ui] changed Learn icon
2015-07-17 15:55:10 +05:30
Anand Doshi
285135da8e
[ui] Remove 'Stopped' alert banner in Sales Order
2015-07-17 15:14:40 +05:30
Anand Doshi
906c2babaa
[ui] Show ERPNext icon instead of ERPNext in navbar
2015-07-17 15:14:39 +05:30
Nabin Hait
14a394cde1
Update fields_to_be_renamed.py
2015-07-17 15:14:19 +05:30
Nabin Hait
3c821c89f2
Update rename_table_fieldnames.py
2015-07-17 15:13:29 +05:30
Nabin Hait
a041297861
Update rename_total_fields.py
2015-07-17 15:12:52 +05:30
Rushabh Mehta
856ee10dc4
[enhancement] update to setup wizard, added users, employees, sample data
2015-07-17 15:03:18 +05:30
Nabin Hait
1401e3f679
Update rename_total_fields.py
2015-07-17 14:43:19 +05:30
Nabin Hait
dae29bf2d4
Update fields_to_be_renamed.py
2015-07-17 14:42:46 +05:30
Nabin Hait
0a3be6da27
Update rename_table_fieldnames.py
2015-07-17 14:39:41 +05:30
Nabin Hait
3631e9cbe0
Merge branch 'develop'
2015-07-16 17:15:41 +05:30
Nabin Hait
1c9a7d2a1b
bumped to version 5.2.0
2015-07-16 17:45:40 +06:00
Anand Doshi
972f2f9194
[change-log]
2015-07-16 16:19:30 +05:30
Anand Doshi
239296d16a
Merge pull request #3657 from nabinhait/fix4
...
Reserved warehouse should not be validated on cancellation of sales order
2015-07-16 15:57:59 +05:30
Anand Doshi
3210db9056
Merge pull request #3656 from rmehta/sms-log
...
[fix] create SMS Log
2015-07-16 15:56:08 +05:30
Neil Trini Lasrado
feda4f9bc9
Default Expense Account added to Expense Claim Type. Fetch account while making Bank Entry
2015-07-16 15:44:56 +05:30
Anand Doshi
f6954fb798
Merge pull request #3663 from neilLasrado/bom
...
Bom
2015-07-16 15:02:40 +05:30
Anand Doshi
c6656e68b8
Merge pull request #3666 from nabinhait/patch-fix
...
[patch][fix] Sales BOM should be renamed before rename_table_fields patch
2015-07-16 14:55:35 +05:30
Anand Doshi
a39387d352
Merge pull request #3664 from rmehta/develop
...
[cleanup] removed welcome emails
2015-07-16 14:25:24 +05:30
Rushabh Mehta
f3791797d6
[fix] [patch]
2015-07-16 14:17:59 +05:30
Rushabh Mehta
ea4d63cef3
[cleanup] removed welcome emails
2015-07-16 14:17:59 +05:30
Nabin Hait
5464ca8a73
[patch][fix] Sales BOM should be renamed before rename_table_fields patch
2015-07-16 12:19:57 +05:30
Rushabh Mehta
6c6875f503
[cleanup] removed welcome emails
2015-07-16 11:53:18 +05:30
Neil Trini Lasrado
20523c45c7
Patch for default BOM
2015-07-16 11:27:06 +05:30
Neil Trini Lasrado
0248811e53
Fixed deafault BOM problem
2015-07-16 11:26:40 +05:30
Rushabh Mehta
93416ee72c
Update sponsors.md
2015-07-15 16:42:46 +05:30
Rushabh Mehta
51e7086a08
[patch] rename roles
2015-07-15 16:30:49 +05:30
Anand Doshi
5e849ae53e
[help] added new links to Learn
2015-07-15 15:23:02 +05:30
Rushabh Mehta
de0db0d000
Merge pull request #3658 from anandpdoshi/anand-july-15
...
[fix] Mozilla hack for images in table for print
2015-07-15 12:58:19 +05:30
Anand Doshi
f3a67c4533
[fix] Mozilla hack for images in table for print
2015-07-15 12:37:45 +05:30
Nabin Hait
0847f9a074
Reserved warehouse should not be validated on cancellation of sales order
2015-07-14 18:23:05 +05:30
Anand Doshi
9490c21b8a
Merge pull request #3641 from rmehta/role-rename
...
[rename] Material User > Stock User
2015-07-14 12:10:48 +05:30
Rushabh Mehta
bdb71bca4e
[perm] added stock, project user for company
2015-07-14 11:54:42 +05:30
Anand Doshi
e8861e2871
Merge pull request #3649 from rmehta/purchase-invoice-fix
...
[fix] supplier invoice number fix
2015-07-14 11:50:07 +05:30
Anand Doshi
b084b5e449
Merge pull request #3651 from rmehta/pos-default-pay-fix
...
[fix] pos default payment #3631
2015-07-14 11:49:46 +05:30
Anand Doshi
41d3e57702
Merge pull request #3650 from rmehta/time-log-fix-2
...
[fix] overlap fix in time log #3647
2015-07-14 11:45:49 +05:30
Anand Doshi
9df2899f72
Merge pull request #3648 from rmehta/time-log-fix
...
[fixes] hours in time-log #3644 , project buttons on condition, removed Guest permission in notification_control
2015-07-14 11:25:46 +05:30
Rushabh Mehta
dacf127f1b
[fix] time log overlap condition, #SavedByATestCase
2015-07-14 11:06:28 +05:30
Rushabh Mehta
2b49f9b30a
[fix] pos default payment #3631
2015-07-14 11:01:42 +05:30
Rushabh Mehta
533434e878
[fix] overlap fix in time log #3647
2015-07-14 10:39:33 +05:30
Rushabh Mehta
1956028ddc
[fix] supplier invoice number fix
2015-07-14 10:26:50 +05:30
Rushabh Mehta
a87dc3b4e6
[minor] move position in accounts settings
2015-07-14 10:22:07 +05:30
Rushabh Mehta
97b3f750c9
[fixes] hours in time-log #3644 , project buttons on condition, removed Guest permission in notification_control
2015-07-14 10:14:48 +05:30
Anand Doshi
c41b63eff1
Merge pull request #3642 from anandpdoshi/anand-july-13
...
Fixes to Cart
2015-07-13 16:56:37 +05:30
Anand Doshi
e6f7ac961f
[fix] Add to Cart visibility, Customer's Price List in Shopping Cart and Address creation from Shopping Cart
2015-07-13 16:24:37 +05:30
Rushabh Mehta
cf26964deb
Merge pull request #3640 from anandpdoshi/anand-july-13
...
Fixes to Issues
2015-07-13 15:37:11 +05:30
Rushabh Mehta
94157334a7
[rename] Material User > Stock User
2015-07-13 15:06:12 +05:30
Anand Doshi
c530161de0
[fix] Item image urls can now have paranthesis
2015-07-13 15:05:39 +05:30
Nabin Hait
2212ae12d8
Merge branch 'develop'
2015-07-13 14:26:23 +05:30
Nabin Hait
54ade0d26c
bumped to version 5.1.6
2015-07-13 14:56:23 +06:00
Nabin Hait
f043760526
Merge pull request #3639 from neilLasrado/develop
...
Sales BOM to Product Bundle rename changes
2015-07-13 14:22:10 +05:30
Neil Trini Lasrado
1cd049d824
Sales BOM to Product Bundle rename changes
2015-07-13 14:17:42 +05:30
Nabin Hait
0a45260ed9
Merge branch 'develop'
2015-07-13 13:09:05 +05:30
Nabin Hait
1540ad12f9
bumped to version 5.1.5
2015-07-13 13:39:05 +06:00
Nabin Hait
76bd015b2c
Merge pull request #3637 from rmehta/time-log-filter
...
[minor] [enhancement] added employee filter in timelog #3607
2015-07-13 13:04:03 +05:30
Rushabh Mehta
5054a3955b
Update CONTRIBUTING.md
2015-07-13 12:54:08 +05:30
Nabin Hait
1a0713e4b9
Merge pull request #3584 from neilLasrado/develop
...
Minor fixes
2015-07-13 12:49:46 +05:30
Rushabh Mehta
e9604d8484
[minor] [enhancement] added employee filter in timelog #3607
2015-07-13 12:47:45 +05:30
Neil Trini Lasrado
008d1a0334
Fixes in Stock Entry
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
fe2ffaeafa
Fixes in Production Planning Tool
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
dcef448f1e
Planned Start Date added to Production Planning Tool
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
6224cfc414
Manage Variants added in Tools under Stock Module
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
700434ff37
has_variants made 'no copy' in Item Master
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
4089b3d376
Salary Slip renamed to Process Payroll
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
6cfab43d5f
Renamed Depends on LWP field in the Earning and Deduction table of Salary Slip.
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
09a66c4201
Fixed issue with Customer Contacts in Transaction Documents
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
ed8cecbdd8
Sales BOM renamed to Product Bundle
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
c70109d0c5
Item table made mandatory in Stock Reconciliation
2015-07-13 12:40:57 +05:30
Neil Trini Lasrado
ccf8c337f7
Expected Delivery date validation changed to message
2015-07-13 12:40:57 +05:30
Nabin Hait
6809b4d86c
Merge pull request #3636 from neilLasrado/po
...
Patch for Production Order Track Operation
2015-07-13 12:38:45 +05:30
Neil Trini Lasrado
cc08c68153
Patch for Production Order Track Operation
2015-07-13 12:35:20 +05:30
Nabin Hait
7daa7900ea
Merge pull request #3614 from neilLasrado/po
...
Track Operations added to Production Order
2015-07-13 12:29:45 +05:30
Nabin Hait
7641f3fe53
Merge pull request #3635 from nabinhait/fix3
...
Reserved warehouse should not be validated on cancellation of sales order
2015-07-13 12:28:49 +05:30
Nabin Hait
fe2f51bbbc
Merge pull request #3628 from nabinhait/sponsors
...
Change log and Sponsors page
2015-07-13 12:27:30 +05:30
Neil Trini Lasrado
4f33249e1c
Fixes in Production Order
2015-07-13 12:26:33 +05:30
Nabin Hait
b95b606f25
sponsors page and change log
2015-07-13 12:26:24 +05:30
Nabin Hait
e690f245f2
Change log and Sponsors page
2015-07-13 12:26:24 +05:30
Neil Trini Lasrado
5da4d857c9
Track Operations added to Production Order
2015-07-13 12:01:57 +05:30
Nabin Hait
6e38e917eb
Reserved warehouse should not be validated on cancellation of sales order
2015-07-13 11:36:36 +05:30
Rushabh Mehta
f3b0b95b15
[fix] [filter] for general ledger
2015-07-13 10:24:25 +05:30
Nabin Hait
7b0f1ffb2d
Merge pull request #3627 from nabinhait/fix2
...
PP Tool: Create production order if applicable for item
2015-07-10 17:32:16 +05:30
Nabin Hait
97bb6bbaf4
Merge pull request #3621 from neilLasrado/batch
...
Validation added to prevent adding items with expired batch numbers t…
2015-07-10 17:31:52 +05:30
Neil Trini Lasrado
cb4b2ec52a
Fixes in validate baatch function
2015-07-10 17:31:06 +05:30
Nabin Hait
f18bbcef86
PP Tool: Create production order if applicable for item
2015-07-10 17:31:03 +05:30
Nabin Hait
27976382d8
Merge pull request #3626 from nabinhait/credit_days
...
minor fix in due date validation
2015-07-10 17:13:15 +05:30
Nabin Hait
93d3c82737
minor fix in due date validation
2015-07-10 17:12:08 +05:30
Neil Trini Lasrado
03bf529622
Validation added to prevent adding items with expired batch numbers to stock ledger entry
2015-07-10 16:20:21 +05:30
Nabin Hait
6c4085fc0c
Merge pull request #3616 from nabinhait/credit_days
...
Customer's credit days based on fixed days / last day of the next month
2015-07-10 16:16:14 +05:30
Nabin Hait
c37484c8da
Merge pull request #3622 from rmehta/minor-fixes
...
[fix] cart and general leger report
2015-07-10 16:12:01 +05:30
Rushabh Mehta
b4ec294463
Merge pull request #3625 from neilLasrado/task
...
Validation added to prevent task being closed with open dependent tasks
2015-07-10 14:30:46 +05:30
Neil Trini Lasrado
58406a920c
Validation added to prevent task being closed with open dependent tasks
2015-07-10 12:57:49 +05:30
Rushabh Mehta
98311f4394
Merge pull request #3624 from pdvyas/lang
...
Fix lang code for česky and update translations
2015-07-10 12:37:31 +05:30
Pratik Vyas
53829707ad
Fix lang code for česky
2015-07-10 12:05:53 +05:30
Pratik Vyas
fcc31028c6
Update translations
2015-07-10 12:05:24 +05:30
Rushabh Mehta
fc3d87181a
[fix] cart and general leger report
2015-07-10 10:11:07 +05:30
Nabin Hait
6336ff7323
minor fixes
2015-07-09 19:48:21 +05:30
Nabin Hait
fde13e666a
Merge pull request #3609 from rmehta/address-link
...
[fix] link address via owner, if created in portal #3540
2015-07-09 19:09:39 +05:30
Nabin Hait
f80c09290e
Merge pull request #3610 from nabinhait/variants
...
Adding rows not allowed in Variant table in Manage Variants and Item
2015-07-09 19:07:56 +05:30
Nabin Hait
b797963bd8
Merge pull request #3618 from neilLasrado/naming
...
Validation added in Production Order
2015-07-09 18:53:39 +05:30
Nabin Hait
03b42a7934
Merge pull request #3619 from neilLasrado/contact
...
Allowed same contact to be Linked to Customer AND Supplier AND Sales …
2015-07-09 18:52:22 +05:30
Nabin Hait
7e9ff99a6c
Merge pull request #3620 from nabinhait/currency_symbol
...
Currency symbol fixed in sales invoice outstanding and advance amount
2015-07-09 18:51:38 +05:30
Nabin Hait
5cbe3441e8
Reload doctype in patch
2015-07-09 18:42:15 +05:30
Nabin Hait
0724449d0e
[patch] Set 'Credit days based on' in existing customer, customer group and company
2015-07-09 17:49:50 +05:30
Neil Trini Lasrado
5a6ff218e8
Allowed same contact to be Linked to Customer AND Supplier AND Sales Partner
2015-07-09 17:49:40 +05:30
Nabin Hait
122e4e0a96
Currency symbol fixed in sales invoice outstanding and advance amount
2015-07-09 17:36:58 +05:30
Neil Trini Lasrado
e233f0e2ff
Validation added in Production Order to prevent PO against Item Template or if Allow PO is No in Item Master
2015-07-09 17:35:51 +05:30
Nabin Hait
40e92b679b
Posting date trigger function commonified
2015-07-09 17:12:23 +05:30
Nabin Hait
4770a1abb5
Customer's credit days based on fixed days / last day of the next month
2015-07-09 16:35:53 +05:30
Rushabh Mehta
ccb9117ba5
[minor] Added employees in Newsletter List
2015-07-09 13:56:02 +05:30
Nabin Hait
db938762c7
[fix] Adding rows not allowed in Variant table in Manage Variants and Item form
2015-07-09 11:55:38 +05:30
Nabin Hait
0910fc3b25
Merge pull request #3605 from nabinhait/testcases
...
Test case fixed
2015-07-09 11:28:36 +05:30
Rushabh Mehta
f0737667c6
[fix] link address via owner, if created in portal #3540
2015-07-09 11:09:01 +05:30
Nabin Hait
2d83122c6b
removed client side test cases
2015-07-08 18:02:42 +05:30
Nabin Hait
e2b7f832cc
Test case fixed
2015-07-08 17:56:06 +05:30
Nabin Hait
6a6958db5c
Merge branch 'develop'
2015-07-08 16:53:55 +05:30
Nabin Hait
ab1acb460b
bumped to version 5.1.4
2015-07-08 17:23:55 +06:00
Nabin Hait
48d71fa7f7
Merge pull request #3602 from nabinhait/develop
...
Change log
2015-07-08 16:47:14 +05:30
Nabin Hait
30960e6a06
Change log added
2015-07-08 16:46:28 +05:30
Nabin Hait
736000c223
Merge pull request #3600 from neilLasrado/batch
...
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 16:10:21 +05:30
Nabin Hait
4017bfcd2e
Merge pull request #3591 from rmehta/salary-manager-fix
...
[fixes] salary manager #3554
2015-07-08 15:39:33 +05:30
Nabin Hait
e594e5de49
Merge pull request #3596 from neilLasrado/pos
...
Mode of Payment added to POS Profile
2015-07-08 15:36:30 +05:30
Nabin Hait
1f1f14be39
Merge pull request #3599 from nabinhait/develop
...
Multiple fixes
2015-07-08 15:33:57 +05:30
Neil Trini Lasrado
ebb60f5dbc
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 15:24:02 +05:30
Neil Trini Lasrado
75b00e3958
Mode of Payment added to POS Profile
2015-07-08 14:43:47 +05:30
Nabin Hait
5e3646ad6e
validation message fix
2015-07-08 14:39:03 +05:30
Nabin Hait
4439d8264f
minor fix
2015-07-08 14:32:56 +05:30
Nabin Hait
00d79eb68d
minor fix
2015-07-08 14:32:27 +05:30
Nabin Hait
28a9e35de9
Validate item rate with reference document with tolerance 0.009
2015-07-08 13:10:59 +05:30
Nabin Hait
c450536a2c
[fix] Map values in Debit / Credit Note from Stock Entry
2015-07-08 13:10:59 +05:30
Nabin Hait
3b3c48c877
[fix] Set Customer name in opportunity as per company name in lead
2015-07-08 13:10:59 +05:30
Rushabh Mehta
621d6eac3c
[minor] added calendar hooks
2015-07-08 12:39:27 +05:30
Rushabh Mehta
f9b356992a
[fixes] salary manager #3554
2015-07-07 16:30:29 +05:30
Nabin Hait
c516e1871d
Merge branch 'develop'
2015-07-06 15:32:32 +05:30
Nabin Hait
9a38e669ef
bumped to version 5.1.3
2015-07-06 16:02:32 +06:00
Nabin Hait
143f2c6faf
Merge pull request #3585 from nabinhait/change_log
...
Added change log
2015-07-06 15:15:29 +05:30
Nabin Hait
9269813207
Added change log
2015-07-06 15:13:35 +05:30
Nabin Hait
0e6f92efa8
Merge pull request #3571 from neilLasrado/item-varients
...
Fixes for Item Attributes
2015-07-06 14:56:33 +05:30
Neil Trini Lasrado
1a0e86f11d
Update item_attribute.py
...
Error Description Changed
2015-07-06 14:46:06 +05:30
Nabin Hait
73b7efd61d
Merge pull request #3583 from rmehta/quotation-list-fix
...
[fix] quotation list #3492
2015-07-06 14:31:23 +05:30
Nabin Hait
4c4a5b968c
Merge pull request #3576 from nabinhait/variant
...
[fix][patch] delete item variant attributes if no variants exists against that item
2015-07-06 14:30:48 +05:30
Nabin Hait
7b5ac6396a
Merge pull request #3575 from nabinhait/batch_report
...
[fix] Hide zero balance rows in batch-wise balance history report
2015-07-06 14:30:23 +05:30
Nabin Hait
01771e8afc
Merge pull request #3573 from rmehta/fix-labels
...
[fix] [minor] fix customer_name, supplier_name labels
2015-07-06 14:30:13 +05:30
Nabin Hait
347c4affe9
Merge pull request #3567 from rmehta/item-description-mozilla-fix
...
[fix] item image in mozilla #3412 #3413
2015-07-06 14:27:34 +05:30
Nabin Hait
526957505f
Merge pull request #3569 from rmehta/employee-unset-user-id
...
[fix] remove user permission if user id is unset #3447
2015-07-06 14:27:22 +05:30
Nabin Hait
faa3416852
Merge pull request #3570 from rmehta/remove-masters-from-setup
...
[minor] remove the term 'Masters' from setup, it is confusing and not used anywhere, add Company to Accounts tab
2015-07-06 14:26:51 +05:30
Rushabh Mehta
56912791e2
[fix] quotation list #3492
2015-07-06 11:14:31 +05:30
Rushabh Mehta
38647c68b9
Merge pull request #3579 from neilLasrado/autocomplete
...
Autocomplete issues fixed in Manage Variants
2015-07-05 13:52:56 +05:30
Neil Trini Lasrado
4d64acfafc
Autocomplete issues fixed in Manage Variants
2015-07-04 14:50:00 +05:30
Nabin Hait
d7441ec051
[fix][patch] delete item variant attributes if no variants exists against that item
2015-07-03 19:20:27 +05:30
Rushabh Mehta
0f15273bd7
Merge pull request #3572 from tmimori/develop
...
Fix for Monthly Attendance Report #3402
2015-07-03 15:49:26 +05:30
Nabin Hait
24efb3122a
[fix] Hide zero balance rows in batch-wise balance history report
2015-07-03 15:20:14 +05:30
Rushabh Mehta
85e6f5d04e
[fix] [minor] fix customer_name, supplier_name labels
2015-07-03 12:59:08 +05:30
Neil Trini Lasrado
1faaf71dfc
Auto-Capitalize Item Attribute Abbreation, Prevent attribute to be deleated if Variant exists
2015-07-03 12:44:01 +05:30
Tsutomu Mimori
5a0fbff1a3
#3402
2015-07-03 16:08:02 +09:00
Rushabh Mehta
7278c0ae85
[minor] remove the term 'Masters' from setup, it is confusing and not used anywhere, add Company to Accounts tab
2015-07-03 12:21:50 +05:30
Rushabh Mehta
5688a6c31a
[fix] remove user permission if user id is unset #3447
2015-07-03 11:34:53 +05:30
Rushabh Mehta
71349d221b
[fix] item image in mozilla #3412 #3413
2015-07-03 10:43:35 +05:30
Nabin Hait
b7219dc698
Merge branch 'develop'
2015-07-02 17:58:40 +05:30
Nabin Hait
37c6ce7b1e
bumped to version 5.1.2
2015-07-02 18:28:40 +06:00
Nabin Hait
7028ba507e
Merge pull request #3561 from nabinhait/develop
...
Fixes
2015-07-02 17:55:18 +05:30
Nabin Hait
fcee17fd16
Removed purchase item validation
2015-07-02 17:51:35 +05:30
Nabin Hait
5906f02e3a
update item image in invoice if item exists
2015-07-02 17:51:35 +05:30
Nabin Hait
721dcb1870
Merge branch 'develop'
2015-07-02 16:33:52 +05:30
Nabin Hait
6385967ccd
bumped to version 5.1.1
2015-07-02 17:03:52 +06:00
Nabin Hait
81a977cacf
Merge pull request #3559 from nabinhait/develop
...
Fixes
2015-07-02 16:32:34 +05:30
Nabin Hait
34058ded0e
[fix] Update item image in sales invoice
2015-07-02 16:31:55 +05:30
Nabin Hait
e98120b716
[fix] Change log path
2015-07-02 16:29:28 +05:30
Nabin Hait
50e363b24e
Merge branch 'develop'
2015-07-02 15:28:49 +05:30
Nabin Hait
bc176b6bf8
bumped to version 5.1.0
2015-07-02 15:58:49 +06:00
Nabin Hait
784b49e54e
change log
2015-07-02 15:28:15 +05:30
Nabin Hait
04fb6e1a45
Merge pull request #3558 from nabinhait/develop
...
Change log
2015-07-02 15:22:20 +05:30
Nabin Hait
dffd7c3889
Change log
2015-07-02 15:21:25 +05:30
Nabin Hait
0c7594e5ed
Merge pull request #3557 from rmehta/item-description-in-form
...
[fix] show item description in form grid based on in_list_view
2015-07-02 15:19:24 +05:30
Rushabh Mehta
5105f909d6
[fix] show item description in form grid based on in_list_view
2015-07-02 15:09:18 +05:30
Nabin Hait
2ab9d6e92c
Merge pull request #3552 from nabinhait/develop
...
Recurring docs should not consider Stopped documents and should be scheduled for hourly
2015-07-02 14:42:57 +05:30
Nabin Hait
7580723ab3
Recurring docs should not consider Stopped documents and should be scheduled for hourly
2015-07-02 14:41:27 +05:30
Nabin Hait
52fef71c14
Merge pull request #3543 from rmehta/against-account-fix
...
Fix against account to show party instead of account
2015-07-02 14:28:11 +05:30
Rushabh Mehta
2cd02af80a
[fix] patch date
2015-07-02 14:25:51 +05:30
Rushabh Mehta
0b0ec3536c
[change-log] added
2015-07-02 14:25:51 +05:30
Rushabh Mehta
6b35ea873b
[fix] against account in general ledger will show party
2015-07-02 14:25:51 +05:30
Nabin Hait
ecf220a721
Merge pull request #3549 from neilLasrado/item-varients
...
Validation changed for Item Template cannot have Stock
2015-07-02 14:18:31 +05:30
Nabin Hait
04fb1c7fe4
Merge pull request #3550 from neilLasrado/item-desc
...
Image feild added to Sales Invoice & Purchase Invoice
2015-07-02 14:17:52 +05:30
Neil Trini Lasrado
53bd62eafc
Validation changed for Item Template cannot have Stock
2015-07-02 14:15:23 +05:30
Nabin Hait
ff68bf2609
Merge pull request #3551 from nabinhait/develop
...
Fixes
2015-07-02 14:10:58 +05:30
Nabin Hait
fdd0db3459
Update project completion percentage and costing after syncing task
2015-07-02 14:09:49 +05:30
Nabin Hait
f92465981c
datetime issue fixed in maintenance schedule
2015-07-02 14:09:49 +05:30
Nabin Hait
885c70984d
[fix] Always show Sales invoice in Gross profit report
2015-07-02 14:09:49 +05:30
Neil Trini Lasrado
9c15ef903d
Image feild added to Sales Invoice & Purchase Invoice
2015-07-02 13:09:57 +05:30
Rushabh Mehta
bc799885d0
[fix] bom client script
2015-07-02 12:44:16 +05:30
Nabin Hait
cb129264cb
Merge pull request #3386 from neilLasrado/item-varients
...
[redesign] Manage Item varients
2015-07-01 18:29:04 +05:30
Neil Trini Lasrado
fe9cd1d875
More Fixes in Manage Varients
2015-07-01 14:41:30 +05:30
Neil Trini Lasrado
64fbe955c7
Modified Date changed for Item Doctype
2015-07-01 14:04:00 +05:30
Neil Trini Lasrado
0988440fd9
Fixes for Manage Variants
2015-07-01 13:17:15 +05:30
Neil Trini Lasrado
274dd4ada0
Fixed Manage Variants Attribute autocomplete appearance.
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
724fd82419
Fixes in Manage Variants
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
3f2604eff6
Patch for Item Variants
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
c761fefb78
more fixes in test records
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
203cb10ef7
fixes in test cases
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
90c66b1998
test cases added
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
fed431f908
Code Fixes in Manage Variants
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
bd9745ba72
Rename Item Variant from Manage Variants feature Added.
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
8fb123b20e
item variants, creation, deleation and update logic added.
...
logic added to copy changes in template to variants
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
333ccd212b
variants combination generation logic added
2015-07-01 12:51:10 +05:30
Neil Trini Lasrado
c8cc8b7115
manage variants new doctype created
2015-07-01 12:51:10 +05:30
Nabin Hait
ec44fa95ce
Merge pull request #3537 from neilLasrado/project
...
Fixed Issues in Project Task
2015-06-30 17:29:19 +05:30
Neil Trini Lasrado
a25e8ea0bc
Fixed Issues in Project Task
2015-06-30 17:15:13 +05:30
Rushabh Mehta
ea02b9a5c3
Merge pull request #3530 from anandpdoshi/anand-june-29
...
[fix] Item Variant Attribute autocomplete appearance. Fixes #3488 , #3515 , #3525
2015-06-30 13:05:19 +05:30
Rushabh Mehta
74a63bf003
Merge pull request #3531 from pdvyas/exchange-rate-api
...
Change currency exchange rate api to fixer.io
2015-06-30 12:46:52 +05:30
Pratik Vyas
a0f2510b01
Change currency exchange rate api to fixer.io
2015-06-30 12:36:17 +05:30
Anand Doshi
0820161157
[fix] Item Variant Attribute autocomplete appearance. Fixes #3488 , #3515 , #3525
2015-06-29 20:57:06 -07:00
Nabin Hait
56bc215855
Merge pull request #3505 from neilLasrado/print-format
...
Recurring Invoice Print Format
2015-06-29 18:54:24 +05:30
Nabin Hait
8687d25f7e
Merge pull request #3526 from neilLasrado/minor-fixes
...
Minor fixes
2015-06-29 18:53:10 +05:30
Nabin Hait
9cea01fa8b
Merge pull request #3527 from nabinhait/develop
...
Journal Entry list view and delete events via query
2015-06-29 18:39:43 +05:30
Nabin Hait
e06d01e3ed
Delete events via query instead of delete_doc function, to save time
2015-06-29 18:38:38 +05:30
Nabin Hait
11243a4fb4
Show amount in Journal Entry list view
2015-06-29 18:38:38 +05:30
Neil Trini Lasrado
b9e5cd0df4
Fixed lead status not updating on Creation of oppurtunity issue
2015-06-29 17:01:32 +05:30
Neil Trini Lasrado
a1f1edc786
Typo fixes in Sales Person
2015-06-29 16:04:12 +05:30
Neil Trini Lasrado
e2d8dd0663
added recurring print format to sales/purchase invoice and order
2015-06-29 12:50:41 +05:30
Nabin Hait
d1605c5cb2
Merge branch 'develop'
2015-06-27 13:09:05 +05:30
Nabin Hait
64ca52fb77
bumped to version 5.0.29
2015-06-27 13:39:05 +06:00
Nabin Hait
2f11a3bdaf
Merge pull request #3523 from nabinhait/develop
...
Multiple fixes
2015-06-27 13:07:44 +05:30
Nabin Hait
943dc1f59c
Merge branch 'develop'
2015-06-27 13:07:01 +05:30
Nabin Hait
6d1c994bc9
bumped to version 5.0.28
2015-06-27 13:37:01 +06:00
Nabin Hait
93cdee4503
[fix] Escape values in queries
2015-06-27 12:51:00 +05:30
Nabin Hait
dfac6848cc
In list view property added in BOM
2015-06-26 14:42:51 +05:30
Nabin Hait
8ad0b4e0b9
Show Issue id in list view from customer login
2015-06-26 14:42:51 +05:30
Nabin Hait
b8cd92f1aa
Merge pull request #3517 from neilLasrado/batch
...
Added validation to prevent transfer of raw material from an expired …
2015-06-25 18:20:46 +05:30
Nabin Hait
1fe48cb820
Merge pull request #3514 from anandpdoshi/anand-june-24
...
[fix] Use per_billed instead of per_delivered and per_received for open notification
2015-06-25 18:04:26 +05:30
Anand Doshi
723b046c5b
[fix] Use per_billed instead of per_delivered and per_received for open notification
2015-06-24 19:21:52 -04:00
Neil Trini Lasrado
035160c9a6
Added validation to prevent transfer of raw material from an expired batch for manufacturing
2015-06-24 15:25:57 +05:30
Nabin Hait
01c7ce1da3
Merge pull request #3508 from nabinhait/develop
...
[fix] validate items in stock entry for subcontracting against PO
2015-06-23 11:12:23 +05:30
Nabin Hait
9cf2910ba1
[fix] validate items in stock entry for subcontracting against purchase order
2015-06-23 11:07:34 +05:30
Nabin Hait
c8da7b7d32
Merge branch 'develop'
2015-06-23 10:27:59 +05:30
Nabin Hait
9679d31397
bumped to version 5.0.27
2015-06-23 10:57:59 +06:00
Nabin Hait
38bebe1b83
Merge pull request #3503 from neilLasrado/leave-application
...
Fixed bugs in Calender View for Leave Application
2015-06-22 19:32:16 +05:30
Nabin Hait
ffbc11e8de
Merge pull request #3504 from nabinhait/develop
...
Multiple fixes
2015-06-22 19:29:32 +05:30
Nabin Hait
818d9674d9
[fix] Update outstanding amount function fixed if party not mentioned
2015-06-22 18:21:38 +05:30
Neil Trini Lasrado
086f8942eb
Fixed bugs in Calender View for Leave Application
2015-06-22 13:51:56 +05:30
Nabin Hait
c3b492b237
[fix] Auto remarks in Journal Entry based on company currency
2015-06-22 07:52:38 +05:30
Nabin Hait
9d0dd5066a
Removed 'Root Type' validation for receivable/payable account in sales/purchase invoice
2015-06-22 07:32:46 +05:30
Nabin Hait
e7f479b26a
Validate accounting entry agaist Stock account if perpetual inventory enabled
2015-06-22 07:31:49 +05:30
Nabin Hait
7ee45b4af2
[fix] Batch-wise balance history: show records only with batch-id
2015-06-18 15:29:14 +05:30
Nabin Hait
5cce1e0929
Merge pull request #3489 from nabinhait/develop
...
Opening balance
2015-06-18 10:34:31 +05:30
Nabin Hait
be496bc91c
[fix] Trial Balance opening
2015-06-18 10:33:20 +05:30
Nabin Hait
59f063e5c3
[fix] opening balance in general ledger report
2015-06-18 10:33:20 +05:30
Nabin Hait
af5820874c
Merge branch 'develop'
2015-06-17 15:51:00 +05:30
Nabin Hait
495db99719
bumped to version 5.0.26
2015-06-17 16:21:00 +06:00
Nabin Hait
123beb5a07
Merge pull request #3484 from rmehta/bom-search-report
...
[report] BOM Search
2015-06-17 15:38:39 +05:30
Nabin Hait
7ed4e080a2
Merge pull request #3486 from nabinhait/develop
...
Opening balance
2015-06-17 15:36:06 +05:30
Nabin Hait
e91025c0aa
[fix] Opening balance in trial balance and general ledger based on is_opening
2015-06-17 15:35:06 +05:30
Nabin Hait
1ac9f2f50d
[fix] Opening balance in trial balance and general ledger based on is_opening
2015-06-17 15:09:40 +05:30
Nabin Hait
bd9aa13db3
Minor issue in naming series
2015-06-17 15:09:40 +05:30
Rushabh Mehta
ed9d5cfdaf
[minor] cleanup
2015-06-17 02:13:03 +05:30
Rushabh Mehta
bf4547ca5f
[fix] dynamic link in BOM Search report
2015-06-17 02:12:06 +05:30
Rushabh Mehta
b45a6bcb88
[report] BOM Search
2015-06-17 01:54:56 +05:30
Anand Doshi
ac59c2b300
[minor] clear Item's introduction section on refresh
2015-06-16 13:06:48 -04:00
Nabin Hait
6a8d7a1b91
Merge branch 'develop'
2015-06-16 16:50:49 +05:30
Nabin Hait
5d71a28e97
bumped to version 5.0.25
2015-06-16 17:20:49 +06:00
Nabin Hait
7d100a1ee7
Merge pull request #3480 from nabinhait/develop
...
Indexes
2015-06-16 16:49:26 +05:30
Nabin Hait
81dca110eb
Change log added
2015-06-16 16:48:47 +05:30
Nabin Hait
9c852108d0
Added index in sales/purchase invoice and fix in index patch
2015-06-16 16:48:47 +05:30
Nabin Hait
e3ac032696
Merge pull request #3472 from neilLasrado/po
...
Multiple Fixes
2015-06-16 15:52:48 +05:30
Neil Trini Lasrado
64cacfb077
Fixes in Activity Cost
2015-06-16 15:42:40 +05:30
Neil Trini Lasrado
ae4cc078ea
Activity Cost - Mandatory removed for Employee.
2015-06-16 15:30:08 +05:30
Nabin Hait
0ee543e932
Merge pull request #3479 from nabinhait/develop
...
[fix][report] Payment period based on invoice date
2015-06-16 15:29:14 +05:30
Nabin Hait
a123638d37
[fix][report] Payment period based on invoice date
2015-06-16 15:21:00 +05:30
Nabin Hait
58996985ed
Merge pull request #3476 from nabinhait/develop
...
Expense Approver Query and discount label
2015-06-16 15:01:08 +05:30
Nabin Hait
5d0ce7939f
Show only users with Expense Approver role in Expense Claim Approver field
2015-06-15 17:59:37 +05:30
Neil Trini Lasrado
4abf552d7b
Over Production Allowance Percentage Setting added to Manufacturing Settings
2015-06-15 15:58:45 +05:30
Nabin Hait
7c5ba957ac
Label changed for discount amount in base currency
2015-06-15 15:47:07 +05:30
Nabin Hait
77f04e293a
Merge branch 'develop'
2015-06-15 10:35:39 +05:30
Nabin Hait
d1d3237784
bumped to version 5.0.24
2015-06-15 11:05:39 +06:00
Nabin Hait
76f0d26f1e
Merge pull request #3471 from nabinhait/develop
...
Hotfix
2015-06-15 10:32:23 +05:30
Nabin Hait
65922d3079
[fix] supplier invoice date can not be after posting date
2015-06-15 10:23:53 +05:30
Nabin Hait
810041cbe3
[fix] Fixed error due to performance upgrade cleanup
2015-06-15 10:20:11 +05:30
Nabin Hait
b9626659ea
Merge pull request #3465 from neilLasrado/po
...
Po
2015-06-15 10:04:36 +05:30
Nabin Hait
e3d13bee36
Merge pull request #3467 from anandpdoshi/anand-june-12
...
Fixes
2015-06-15 10:03:20 +05:30
Nabin Hait
13bd538aca
Merge branch 'develop'
2015-06-14 22:04:51 +05:30
Nabin Hait
d72a24965b
bumped to version 5.0.23
2015-06-14 22:34:51 +06:00
Nabin Hait
dc633fe360
Merge pull request #3470 from nabinhait/develop
...
Performance upgrade in reports and indexing
2015-06-14 22:01:30 +05:30
Nabin Hait
39046d663d
[patch] Add index on Account and GL Entry table
2015-06-14 20:59:28 +05:30
Nabin Hait
6b01abe9ad
[report][performance] Speed increased by approx 10 times in Trial Balance, General Ledger, AR/AP, Balance Sheet and P&L Statement
2015-06-14 20:59:28 +05:30
Anand Doshi
63e4d31aa6
[fix] Task should be mandatory in Time Log only when Project is mentioned but Production Order is not
2015-06-12 18:59:18 -04:00
Anand Doshi
f2a0161709
[fix] Don't create Time Logs against Production Order if Workstation is not specified in Operations
2015-06-12 18:58:36 -04:00
Neil Trini Lasrado
3c1a4a0b9b
percent_complete made no-copy in Project
2015-06-12 18:34:08 +05:30
Neil Trini Lasrado
82cc2921d1
Validation added to prevent user from creating salary structure with 'From Date' before employee 'Date of joining'
2015-06-12 18:34:08 +05:30
Nabin Hait
87edd86854
Merge branch 'develop'
2015-06-12 18:06:21 +05:30
Nabin Hait
e37dd77923
bumped to version 5.0.22
2015-06-12 18:36:21 +06:00
Nabin Hait
e4f689184f
Merge pull request #3459 from neilLasrado/po
...
Multiple Fixes.
2015-06-12 17:55:23 +05:30
Nabin Hait
85f825e98c
Merge pull request #3463 from nabinhait/develop
...
multiple issues
2015-06-12 17:48:54 +05:30
Nabin Hait
89592c5180
Load tasks in project for printing purpose
2015-06-12 17:37:28 +05:30
Neil Trini Lasrado
587bd144d5
Added Customers Not Buying Since Long Time against Sales Invoice
2015-06-11 18:36:52 +05:30
Neil Trini Lasrado
1f048b2426
Fixes in Activity Cost
2015-06-11 18:36:52 +05:30
Neil Trini Lasrado
1792ff3be7
Validation added in Purchase Invoice to check if Supplier Invoice Date is greater than Posting Date
...
Check Supplier Invoice Number Uniqueness setting added to Accounts Settings
Validation added in Purchase Invoice to check Supplier Invoice Number Uniqueness if Check Supplier Invoice Number Uniqueness is enabled in Accounts Settings
2015-06-11 18:36:52 +05:30
Neil Trini Lasrado
fc595064e0
validation added to prevent Delivery Date in Porduction Order to be lesser than Planned Start Date
2015-06-11 18:36:52 +05:30
Nabin Hait
804b4acb9b
[fix] Issue fixed in C-Form related to field renaming
2015-06-11 16:56:36 +05:30
Nabin Hait
5c7557914b
Removed BOM No from mandatory from Stock Entry against Production Order
2015-06-11 16:50:35 +05:30
Nabin Hait
381a9377d9
Merge branch 'develop'
2015-06-11 16:14:48 +05:30
Nabin Hait
9bdd1aa1ed
bumped to version 5.0.21
2015-06-11 16:44:48 +06:00
Nabin Hait
d0df28bfa0
Merge pull request #3458 from nabinhait/develop
...
[fix] load tasks in project via __setup__ instead of onload function, to return tasks via get_doc
2015-06-11 16:12:05 +05:30
Nabin Hait
1966225450
[fix] load tasks in project via __setup__ instead of onload function, to return tasks via get_doc
2015-06-11 15:31:47 +05:30
Nabin Hait
4cee27eec0
Merge pull request #3446 from anandpdoshi/anand-june-9
...
POS - search by Item Group
2015-06-10 18:42:14 +05:30
Nabin Hait
c7d4eaee79
Merge pull request #3442 from nabinhait/develop
...
fixes in stock entry and report
2015-06-10 18:40:42 +05:30
Nabin Hait
43c1a9b502
[fix] Quote url for item image in product listing page
2015-06-10 18:23:17 +05:30
Nabin Hait
b937fac3ce
[report] Warehouse column added in 'Ordered Items to be Delivered' report
2015-06-10 18:21:57 +05:30
Nabin Hait
53d94996ad
[fix] Query for Against Journal Entry
2015-06-10 18:20:18 +05:30
Anand Doshi
26f6752c1e
POS - search by Item Group
2015-06-09 16:33:46 -04:00
Nabin Hait
bb429745c0
[fix] Blank option in naming series
2015-06-09 18:59:51 +05:30
Nabin Hait
909f0c38f1
[report][enhancement] Payment period based on invoice date: show party columns and filter based on party
2015-06-09 18:42:52 +05:30
Nabin Hait
a790ba05f4
[fix] Item name, description should not be overwritten on saving of stock entry
2015-06-09 18:42:52 +05:30
Nabin Hait
11fc4f85d0
Merge branch 'develop'
2015-06-09 15:56:20 +05:30
Nabin Hait
17452a1695
bumped to version 5.0.20
2015-06-09 16:26:20 +06:00
Nabin Hait
7c3d48e353
Merge pull request #3434 from neilLasrado/material-request
...
Status Indicators fixed in Material Request List
2015-06-09 15:47:46 +05:30
Neil Trini Lasrado
5d288e407c
item variants patch removed
2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
f64fae752f
fixes
2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
82763f052f
Status Indicators fixed in Material Request List
2015-06-09 15:46:57 +05:30
Nabin Hait
bafc73568a
Merge pull request #3435 from neilLasrado/barcode
...
Barcode added to Purchase Receipt
2015-06-09 15:44:09 +05:30
Neil Trini Lasrado
d015195617
fixes in barcode
2015-06-09 15:21:50 +05:30
Neil Trini Lasrado
b2f550ccb3
Barcode added to Purchase Receipt
2015-06-09 15:18:58 +05:30
Nabin Hait
41413af42d
Merge pull request #3437 from anandpdoshi/task-close-assignment
...
[fix] Close assignment (ToDo) when Task status is changed to Closed
2015-06-09 15:00:06 +05:30
Anand Doshi
ec60ebde6f
[fix] Close assignment (ToDo) when Task status is changed to Closed
2015-06-08 12:48:11 -04:00
Nabin Hait
ce81a61fe7
Merge branch 'develop'
2015-06-08 14:45:13 +05:30
Nabin Hait
dc76b3fa20
bumped to version 5.0.19
2015-06-08 15:15:13 +06:00
Nabin Hait
828cbee12a
Merge pull request #3429 from neilLasrado/quality-inspection
...
Get Item Details in Quality Inspection.
2015-06-08 14:24:11 +05:30
Nabin Hait
5f5ef16b91
Merge pull request #3430 from nabinhait/develop
...
Multiple fixes
2015-06-08 14:23:52 +05:30
Nabin Hait
686ef8308a
Show item name in item grid view based 'In List View' property
2015-06-08 14:22:56 +05:30
Nabin Hait
b63ad44b10
Book in round-off account upto max 0.05
2015-06-08 14:15:12 +05:30
Nabin Hait
5ef121bc10
get party details only if party exists
2015-06-08 14:15:11 +05:30
Neil Trini Lasrado
42c1836db5
function changed to add fetch
2015-06-08 13:09:11 +05:30
Neil Trini Lasrado
9dbdef3bd5
added code to fetch item name and desc on change of item code
2015-06-08 12:29:12 +05:30
Nabin Hait
9fd42ed2f7
Merge pull request #3428 from nabinhait/develop
...
[fix] Fiscal year issue due to missing field in Material Request
2015-06-08 12:27:27 +05:30
Nabin Hait
000835c454
[fix] Fiscal year issue due to missing field in Material Request
2015-06-08 12:10:43 +05:30
Nabin Hait
de1f934e22
Merge pull request #3422 from nabinhait/develop
...
Manufactured qty in Stock Entry
2015-06-08 12:07:47 +05:30
Nabin Hait
7cbd916b00
[fix] Fiscal year issue due to missing field in Material Request
2015-06-08 12:06:33 +05:30
Nabin Hait
56fcf30cb9
[Patch] Update material transferred for manufacturing for existing entries
2015-06-05 18:21:35 +05:30
Nabin Hait
ebbdd772a9
[fix] Validate and update manufactured qty in Stock Entry
2015-06-05 18:21:35 +05:30
Pratik Vyas
6268d83173
Merge branch 'develop'
2015-06-05 15:56:49 +05:30
Pratik Vyas
4599467939
bumped to version 5.0.18
2015-06-05 16:26:49 +06:00
Nabin Hait
d3613479c6
Merge pull request #3421 from nabinhait/develop
...
pos link and item description
2015-06-05 15:51:03 +05:30
Nabin Hait
6bf301f53c
Show item description in grid view based on 'In List View' property
2015-06-05 15:49:25 +05:30
Nabin Hait
27d7f21553
[fix] pos profile link in Start POS page
2015-06-05 15:09:44 +05:30
Nabin Hait
8f87cff4bd
Merge pull request #3411 from nabinhait/develop
...
journal entry against expense claim and bank reco
2015-06-05 14:31:23 +05:30
Nabin Hait
8f39766924
Merge pull request #3419 from neilLasrado/time-log
...
operation made non mandatory in time log
2015-06-05 14:30:22 +05:30
Neil Trini Lasrado
39669f2717
operation made non mandatory in time log
2015-06-05 12:17:46 +05:30
Nabin Hait
3c1017c43b
Removed deprecated page users
2015-06-05 12:15:01 +05:30
Nabin Hait
0b18a2d347
Reset values in tools like Payment Tool
2015-06-05 12:01:29 +05:30
Nabin Hait
6262496e70
[fix] item test case
2015-06-03 18:33:47 +05:30
Nabin Hait
c9963f1805
[fix] journal entry against expense claim: pending amount validation
2015-06-03 18:01:09 +05:30
Nabin Hait
8a2b1bcb97
[fix] bank reconciliation: fetch journal entry order by posting date asc
2015-06-03 18:01:09 +05:30
Pratik Vyas
b8ecf7c757
Merge branch 'develop'
2015-06-03 17:43:38 +05:30
Pratik Vyas
cf89fa2253
bumped to version 5.0.17
2015-06-03 18:13:38 +06:00
Nabin Hait
419c1eb90d
Merge pull request #3410 from nabinhait/develop
...
[fix][patch] force reload web-form-field in portal fixes patch
2015-06-03 17:43:01 +05:30
Nabin Hait
2c214e0362
[fix][patch] force reload web-form-field in portal fixes patch
2015-06-03 17:42:12 +05:30
Nabin Hait
7d04dd0bfd
Merge pull request #3408 from williamjmorenor/patch-1
...
Update Chart of Account for Nicaragua
2015-06-03 17:17:09 +05:30
Nabin Hait
f1371a7ee7
Merge pull request #3409 from nabinhait/develop
...
Multiple fixes
2015-06-03 17:15:42 +05:30
Nabin Hait
995a78421a
[fix] Stock analytics report fixed for fifo stack related to stock reco
2015-06-03 16:44:26 +05:30
Nabin Hait
352187bee6
purchase register fix
2015-06-03 12:06:19 +05:30
Nabin Hait
c6d8121f4a
delete fields inline description
2015-06-03 11:24:37 +05:30
Nabin Hait
030ade428b
dont reset company on deleting company transactions
2015-06-03 11:24:37 +05:30
Nabin Hait
c87595b2da
show item description in item grid view if marked for 'In List View'
2015-06-03 11:24:37 +05:30
Nabin Hait
42f2674cba
dynamic link in quotation item
2015-06-03 11:24:37 +05:30
Nabin Hait
5359f2651a
[fix] sales register report
2015-06-03 11:24:37 +05:30
William Moreno
42dcffdad4
Update Chart of Account for Nicaragua
...
Hi
The Law 891 reform some taxes rates, please update the Chart of Account for Nicaragua so it can reflect the new tax rates.
2015-06-02 16:48:47 -06:00
Anand Doshi
f7c1743b28
[hotfix] cart - get_address_docs
2015-06-02 15:20:25 -04:00
Anand Doshi
64aa6620be
[hotfix] portal fixes patch
2015-06-02 11:53:17 -04:00
Rushabh Mehta
ed43f8015c
[lang] let locale be en in setup wizard (?)
2015-06-02 12:31:03 +05:30
Rushabh Mehta
d3fe7ec858
[cleanup] customer not buying since long time report
2015-06-02 12:21:17 +05:30
Rushabh Mehta
c8b406d050
[fix] duplicate status for Submitted, Cancelled
2015-06-02 12:17:14 +05:30
Rushabh Mehta
2aa577f110
[hot] patch-fix
2015-06-02 11:12:25 +05:30
Pratik Vyas
f06d175061
Merge branch 'develop'
2015-06-02 10:45:28 +05:30
Pratik Vyas
74b2116adb
bumped to version 5.0.16
2015-06-02 11:15:28 +06:00
Rushabh Mehta
2204d0af94
Merge pull request #3397 from rmehta/portal-fixes
...
Portal fixes
2015-06-02 10:42:59 +05:30
Pratik Vyas
b8a568765d
Update translations
2015-06-01 23:49:15 +05:30
Rushabh Mehta
cf29f6468d
[minor] add attachment to issue via portal:
2015-06-01 17:47:03 +05:30
Rushabh Mehta
aded46d33e
[fix] product search in new block header_actions
2015-06-01 17:23:42 +05:30
Pratik Vyas
b8dd046c84
Merge branch 'develop'
2015-06-01 17:17:46 +05:30
Pratik Vyas
e5fa5e6111
bumped to version 5.0.15
2015-06-01 17:47:46 +06:00
Nabin Hait
b89cf1b3ec
Merge pull request #3396 from nabinhait/develop
...
item table print template
2015-06-01 17:16:00 +05:30
Rushabh Mehta
a33d468d30
[fixes] portal, issues, addresses etc
2015-06-01 17:15:42 +05:30
Nabin Hait
e481a211b1
item table print template
2015-06-01 17:12:55 +05:30
Rushabh Mehta
ca23b5ecfd
Merge pull request #3395 from nabinhait/develop
...
GL Entries for Journal Entries with multiple Party
2015-06-01 16:35:36 +05:30
Nabin Hait
11190268ab
[fix][patch] GL Entries for Journal Entries with multiple Party, merge entries considering party
2015-06-01 16:21:25 +05:30
Nabin Hait
a19150ddaf
default account's custom query in company
2015-06-01 15:32:57 +05:30
Nabin Hait
c17dff4b01
default account's custom query in company
2015-06-01 15:32:57 +05:30
Pratik Vyas
47fe136d15
Merge branch 'develop'
2015-06-01 14:51:17 +05:30
Pratik Vyas
8f25402dce
bumped to version 5.0.14
2015-06-01 15:21:17 +06:00
Nabin Hait
a9165744e2
Merge pull request #3385 from nabinhait/develop
...
In standard print format, item name will now honour 'Print Hide' property
2015-06-01 14:03:11 +05:30
Nabin Hait
3ebfad7115
minor fixes
2015-06-01 14:01:56 +05:30
Nabin Hait
c7ef8dda79
[fix] Pricing Rule based on qty
2015-06-01 14:01:56 +05:30
Nabin Hait
4a6c178795
On selection of item, set default qty as 1
2015-06-01 14:01:56 +05:30
Nabin Hait
8908543a9c
In standard print format, item name will now honour 'Print Hide' property
2015-06-01 14:01:56 +05:30
Rushabh Mehta
065badc54b
[minor] move buttons from sales invoice to toolbar
2015-05-31 10:36:47 +05:30
Nabin Hait
cd2798368b
Merge pull request #3384 from rmehta/journal-entry-ux
...
[minor] journal entry, copy over party details to new row and automatically set difference
2015-05-29 17:09:53 +05:30
Rushabh Mehta
2c30acdcb2
[minor] journal entry, copy over party details to new row and automatically set difference
2015-05-29 16:33:36 +05:30
Rushabh Mehta
4a4a6594d1
[minor] [refactor]
2015-05-29 15:56:40 +05:30
Pratik Vyas
e3035a593c
Merge branch 'develop'
2015-05-29 14:25:23 +05:30
Pratik Vyas
587dde0044
bumped to version 5.0.13
2015-05-29 14:55:23 +06:00
Pratik Vyas
b6d13ef5b7
Add changelog
2015-05-29 14:24:39 +05:30
Rushabh Mehta
a3e9dbbcc3
Merge pull request #3374 from nabinhait/develop
...
Make gl entry for rounded-off amount
2015-05-29 14:20:20 +05:30
Pratik Vyas
97d2a00d91
Merge branch 'develop'
2015-05-29 14:17:15 +05:30
Pratik Vyas
1749406514
bumped to version 5.0.12
2015-05-29 14:47:15 +06:00
Rushabh Mehta
99b18224f5
[minor] remove order_by in listview, let user customize
2015-05-29 12:48:24 +05:30
Rushabh Mehta
b0b446e899
[fix] cleanup tables from description and re-sync print format
2015-05-29 12:44:33 +05:30
Nabin Hait
80069a6379
Book gl entry automatically due to rounding loss with test cases
2015-05-29 10:39:09 +05:30
Nabin Hait
98c515fe7d
replace 'entries' by 'items' in custom print formats and scripts
2015-05-29 10:39:09 +05:30
Nabin Hait
6ee8c545e3
[fix] gross profit report
2015-05-29 10:39:09 +05:30
Nabin Hait
3c67146e4b
Make gl entry for rounded-off amount
2015-05-29 10:39:09 +05:30
Nabin Hait
e2c200a91e
Make gl entry for rounded-off amount
2015-05-29 10:39:09 +05:30
Nabin Hait
d9d5925f14
[fix] BOM item validation in lower case
2015-05-29 10:39:09 +05:30
Rushabh Mehta
148386f73e
Merge pull request #3380 from anandpdoshi/anand-may-28
...
[fix] selenium test and changed Creation Document No to a Dynamic Link
2015-05-29 10:37:07 +05:30
Anand Doshi
1b6c3f1a39
[fix] selenium test and changed Creation Document No to a Dynamic Link
2015-05-28 23:06:38 -04:00
Pratik Vyas
618fefea73
Merge branch 'develop'
2015-05-28 14:14:58 +05:30
Pratik Vyas
31d9d9f561
bumped to version 5.0.11
2015-05-28 14:44:58 +06:00
Rushabh Mehta
e715572e7c
Merge pull request #3373 from pdvyas/issue-perms
...
[fix] Remove guest perms from Issue
2015-05-28 14:04:21 +05:30
Pratik Vyas
d138b06c8e
Add changelog for v5.0.11 release
2015-05-28 14:00:24 +05:30
Pratik Vyas
37ee57c211
[fix] Remove guest perms from Issue
2015-05-28 13:04:43 +05:30
Rushabh Mehta
95b995be6d
[minor] set timezone in posting time and added help
2015-05-28 12:10:55 +05:30
Nabin Hait
86e479f908
Merge pull request #3355 from rmehta/purchase-invoice-fixes
...
[minor] remove letter head / terms from purchase invoice, fixes #3328 , #3345
2015-05-28 11:19:22 +05:30
Nabin Hait
2a52f59b32
Merge pull request #3370 from rmehta/pos-fix
...
POS fixes
2015-05-28 11:18:29 +05:30
Rushabh Mehta
c185734bf3
[minor] remove letter head / terms from purchase invoice, fixes #3328 , #3345
2015-05-28 11:17:22 +05:30
Rushabh Mehta
beb7c346ea
[fix] [cleanup]
2015-05-28 11:12:29 +05:30
Rushabh Mehta
88655890be
[fix] [refactor] pos hangs in multi-company, if company is not set
2015-05-28 11:11:25 +05:30
Nabin Hait
e7b37af525
Merge pull request #3353 from rmehta/barcode-fix
...
[fix] clear barcode from table, fixes #3320
2015-05-28 11:07:16 +05:30
Nabin Hait
10026ea85c
Merge pull request #3354 from rmehta/discount-field-relabel
...
[cleanup] rename discount and reserver warehouse #3325
2015-05-28 11:02:51 +05:30
Rushabh Mehta
960118a954
Merge pull request #3369 from anandpdoshi/anand-may-27
...
Check if company exists in re-order item
2015-05-28 10:45:27 +05:30
Anand Doshi
8860b9d94d
[fix] Check if company exists in re-order item. Fixes #3365 .
2015-05-28 01:09:21 -04:00
Rushabh Mehta
f4f9be9233
Merge pull request #3364 from anandpdoshi/anand-may-27
...
[fix] Product Search
2015-05-28 10:19:58 +05:30
Anand Doshi
81bded1afe
[fix] Product Search
2015-05-27 16:48:06 -04:00
Nabin Hait
7f1d5efd5b
Merge pull request #3360 from nabinhait/develop
...
patch fix
2015-05-27 16:50:16 +05:30
Nabin Hait
54a10cd2af
patch fix
2015-05-27 16:14:10 +05:30
Pratik Vyas
f52b5ac8af
Merge pull request #3339 from rmehta/help
...
[help] added links in modules, added learn desktop module
2015-05-27 15:21:00 +05:30
Rushabh Mehta
2fd33a2f03
Merge pull request #3358 from nabinhait/develop
...
General ledger, _idx and FY in Material request
2015-05-27 15:10:51 +05:30
Rushabh Mehta
78f137890c
Merge pull request #3351 from anandpdoshi/anand-may-26-production-fixes
...
[fix] workstation fixes related to Production Order
2015-05-27 15:09:47 +05:30
Rushabh Mehta
0d79be5628
Merge pull request #3350 from anandpdoshi/anand-may-26
...
Fixes in shopping cart and website route rules
2015-05-27 15:09:09 +05:30
Pratik Vyas
fa555abbd2
Merge pull request #3344 from rmehta/download-backups
...
Download backups
2015-05-27 15:03:45 +05:30
Nabin Hait
eb00cae86c
Fiscal Year removed from Material Request
2015-05-27 13:18:09 +05:30
Nabin Hait
5b731ff73a
Fix _idx property as per renamed fields
2015-05-27 13:02:59 +05:30
Nabin Hait
5b8db3729c
[fix] General ledger print format
2015-05-27 13:02:59 +05:30
Rushabh Mehta
69fb13f229
[cleanup] rename discount and reserver warehouse #3325
2015-05-27 12:20:07 +05:30
Rushabh Mehta
c2acfc9828
[fix] clear barcode from table, fixes #3320
2015-05-27 12:01:03 +05:30
Anand Doshi
409843d768
[fix] workstation fixes related to Production Order
2015-05-26 19:13:45 -04:00
Anand Doshi
fb4e496b54
[fix] target variance sql
2015-05-26 18:15:55 -04:00
Anand Doshi
ff8a854b82
Fixes #3349 . Thanks @abelbm for reporting.
2015-05-26 18:13:28 -04:00
Anand Doshi
438b67e8b0
[fix] shopping cart - get price list for default territory if no price list is selected
2015-05-26 17:37:39 -04:00
Anand Doshi
e440914327
[fix] allow slashes in variables of website route rules
2015-05-26 17:37:09 -04:00
Pratik Vyas
dcbc4d1a46
Merge branch 'develop'
2015-05-26 17:06:39 +05:30
Pratik Vyas
e1637c4cae
bumped to version 5.0.10
2015-05-26 17:36:39 +06:00
Nabin Hait
b3fb6e1e04
Merge pull request #3342 from rmehta/item-price-import-link
...
[minor] add import link in item price
2015-05-26 16:51:51 +05:30
Nabin Hait
354443b073
Merge pull request #3346 from nabinhait/develop
...
multiple minor fixes
2015-05-26 16:50:10 +05:30
Nabin Hait
d4c8dc2915
multiple minor fixes
2015-05-26 16:32:30 +05:30
Rushabh Mehta
d51cf79fe2
[enhancement] list backups for download
2015-05-26 15:19:27 +05:30
Rushabh Mehta
306c49f8a0
[enhancement] list backups for download
2015-05-26 15:14:58 +05:30
Rushabh Mehta
c7cfa270cd
[minor] add import link in item price
2015-05-26 14:07:05 +05:30
Nabin Hait
1568dc32a2
Merge pull request #3338 from rmehta/bom-multiple-add
...
BOM updates
2015-05-26 12:44:03 +05:30
Nabin Hait
878a18528c
Added BOM Browser link in Manufacturing home page
2015-05-26 12:41:25 +05:30
Rushabh Mehta
5fa6c4ce21
[enhancement] add bom tree view
2015-05-26 12:41:25 +05:30
Nabin Hait
b8ad56f819
Merge pull request #3336 from rmehta/ask-password-before-delete
...
[minor] re-verify password before deleting company transactions
2015-05-26 12:20:55 +05:30
Nabin Hait
b3a142f5ab
[fix] email footer and signature
2015-05-26 12:15:39 +05:30
Nabin Hait
1f5b21673c
minor fix in report
2015-05-26 12:15:39 +05:30
Nabin Hait
093beecd0a
minor fix
2015-05-26 12:15:39 +05:30
Rushabh Mehta
822fd7747a
[email] [website] footer cleanup
2015-05-26 12:15:39 +05:30
Rushabh Mehta
f29a618b69
[email] [website] footer cleanup
2015-05-26 12:15:39 +05:30
Rushabh Mehta
314af94737
[minor] added multiple commit in bom
2015-05-26 12:15:39 +05:30
Rushabh Mehta
6771240471
[help] added links in modules, added learn desktop module
2015-05-25 18:31:08 +05:30
Pratik Vyas
1a804e2217
Merge branch 'develop'
2015-05-25 16:32:12 +05:30
Pratik Vyas
ac9c2de8b9
bumped to version 5.0.9
2015-05-25 17:02:12 +06:00
Nabin Hait
2c6705ef83
Merge pull request #3322 from nabinhait/test_case
...
Test case
2015-05-25 16:19:03 +05:30
Nabin Hait
5536923101
Merge pull request #3337 from nabinhait/fix1
...
Multiple fixes
2015-05-25 16:16:20 +05:30
Nabin Hait
63e431a219
minor fixes
2015-05-25 16:15:39 +05:30
Nabin Hait
e2787cf2ec
[fix] unique employee id validation for sales person
2015-05-25 15:27:40 +05:30
Nabin Hait
c4fa74f51d
sales partner field added in sms center
2015-05-25 15:17:29 +05:30
Nabin Hait
b62068f784
removed debug
2015-05-25 14:46:12 +05:30
Rushabh Mehta
f8594feb55
[enhancement] add bom tree view
2015-05-25 14:26:21 +05:30
Rushabh Mehta
6a0563f4b2
[minor] added multiple commit in bom
2015-05-25 14:26:21 +05:30
Nabin Hait
43539673cc
[fix] sales person wise transaction summary
2015-05-25 14:13:03 +05:30
Nabin Hait
4809d36fbe
validate fields value with reference docs
2015-05-25 14:13:03 +05:30
Nabin Hait
f61f76ba45
[fix] gross profit report
2015-05-25 14:13:03 +05:30
Nabin Hait
8d76d14614
reset item's default accounts, warehouses on deletion of company
2015-05-25 14:13:03 +05:30
Nabin Hait
adc830b712
[fix] rename company abbr
2015-05-25 14:13:03 +05:30
Rushabh Mehta
ed618f284b
[minor] re-verify password before deleting company transactions
2015-05-25 12:20:44 +05:30
Rushabh Mehta
c4d38e2183
[minor] setup wizard language fix and no submit messages for gl/sl entry
2015-05-25 11:29:37 +05:30
Nabin Hait
a5c9cff38a
Merge pull request #3323 from nabinhait/develop
...
stock entry: get item details
2015-05-22 18:05:40 +05:30
Nabin Hait
fe8d107731
stock entry: get item details
2015-05-22 18:04:44 +05:30
Nabin Hait
e2968e9893
minor fixes in test cases
2015-05-22 17:25:55 +05:30
Nabin Hait
fd4bcd855b
test case fixes
2015-05-22 16:55:55 +05:30
Nabin Hait
2eba53f763
test case fixes
2015-05-22 16:55:55 +05:30
Pratik Vyas
866e9047b0
Merge branch 'develop'
2015-05-22 16:52:25 +05:30
Pratik Vyas
08e04ef01a
bumped to version 5.0.8
2015-05-22 17:22:25 +06:00
Nabin Hait
bf3f944bdb
Merge pull request #3318 from nabinhait/report
...
added total row in stock balance report
2015-05-22 16:24:00 +05:30
Nabin Hait
1d08304ba5
added total row in stock balance report
2015-05-22 11:56:13 +05:30
Nabin Hait
fc79e205f0
Merge pull request #3316 from nabinhait/develop
...
share permission and patch fix
2015-05-22 11:51:49 +05:30
Nabin Hait
3b0adc5246
[fix] ignore share permission while creating events on the background
2015-05-21 16:51:37 +05:30
Nabin Hait
4888a5dc0d
[patch][fix] party model - create debtors and creditors only if parent account exists
2015-05-21 16:51:37 +05:30
Pratik Vyas
1686876b23
Merge branch 'develop'
2015-05-21 15:34:34 +05:30
Pratik Vyas
8c6ff9ddad
bumped to version 5.0.7
2015-05-21 16:04:34 +06:00
Rushabh Mehta
3bc3384bc4
[minor] remove section headings
2015-05-21 15:06:51 +05:30
Pratik Vyas
37307215d0
Merge pull request #3315 from nabinhait/develop
...
update operation description patch
2015-05-21 14:58:24 +05:30
Nabin Hait
61704504e6
Merge pull request #3314 from neilLasrado/item-var-validation
...
validation added to item varients
2015-05-21 14:56:51 +05:30
Nabin Hait
9895aba42e
update operation description patch
2015-05-21 14:43:24 +05:30
Neil Trini Lasrado
753e40b4d5
fixes in validation for item varients
2015-05-21 14:38:58 +05:30
Rushabh Mehta
71b7a52990
Merge pull request #3312 from nabinhait/develop
...
[fix] operations and bom
2015-05-21 14:29:14 +05:30
Nabin Hait
e372fb11ea
naming series fix
2015-05-21 14:27:20 +05:30
Nabin Hait
4c924bb76c
totals etc should not be clickable
2015-05-21 13:38:03 +05:30
Nabin Hait
de7b87ee3a
[fix] operations and bom
2015-05-21 13:24:49 +05:30
Nabin Hait
f3ae85cc9a
Merge pull request #3313 from rmehta/material-request-fix
...
[fix] load taxes_and_charges only if field present
2015-05-21 13:22:21 +05:30
Nabin Hait
4a929d53bc
Merge pull request #3310 from neilLasrado/item-var-validation
...
validation added to item varients
2015-05-21 13:21:21 +05:30
Nabin Hait
7f8d6b6252
Merge pull request #3303 from rmehta/letter-head-in-stock-entry
...
[enhancement] letter head in stock entry #3291
2015-05-21 13:20:26 +05:30
Nabin Hait
6789680fa3
Merge pull request #3302 from rmehta/fix-report-strings
...
[fix] totals etc should not be clickable
2015-05-21 13:18:22 +05:30
Nabin Hait
4f3f5308e3
Merge pull request #3301 from rmehta/issue-form-layout
...
[usability] re-layout Issue Form #3218
2015-05-21 13:15:38 +05:30
Nabin Hait
9e38d29df7
Merge pull request #3300 from rmehta/pos-setting-rename
...
[rename] POS Setting > POS Profile #3271
2015-05-21 13:14:59 +05:30
Nabin Hait
15e13c0ed4
Merge pull request #3245 from neilLasrado/opportunity
...
fixes in quotation - from opportunity button didn't work
2015-05-21 13:03:00 +05:30
Rushabh Mehta
4984bccbc6
[fix] load taxes_and_charges only if field present
2015-05-21 12:51:07 +05:30
Neil Trini Lasrado
4258753ae8
validation added to item varients
2015-05-21 12:22:33 +05:30
Neil Trini Lasrado
68a6d61589
filter added for closed oppurtunity
2015-05-20 19:01:37 +05:30
Neil Trini Lasrado
c55edf18ad
fixes in quotation - from opportunity
2015-05-20 18:51:38 +05:30
Rushabh Mehta
a60984866c
[enhancement] letter head in stock entry #3291
2015-05-20 17:45:18 +05:30
Rushabh Mehta
555fa4fbc2
[fix] totals etc should not be clickable
2015-05-20 17:21:53 +05:30
Rushabh Mehta
43c885868f
[usability] re-layout Issue Form
2015-05-20 16:47:45 +05:30
Pratik Vyas
815cb8959a
Merge branch 'develop'
2015-05-20 16:35:40 +05:30
Pratik Vyas
38937ecd3c
bumped to version 5.0.6
2015-05-20 17:05:40 +06:00
Rushabh Mehta
9624bac3cf
[fix] create SMS Log
2015-05-20 15:48:58 +05:30
Rushabh Mehta
a27cca97b5
[rename] POS Setting > POS Profile #3271
2015-05-20 15:43:17 +05:30
Nabin Hait
521aa2e94a
Update party_model.py
2015-05-20 14:39:39 +05:30
Nabin Hait
390df6626b
Merge pull request #3298 from nabinhait/develop
...
party model patch fix
2015-05-20 14:34:42 +05:30
Nabin Hait
a2d8585b07
party model patch fix
2015-05-20 14:32:54 +05:30
Pratik Vyas
84e658058b
Merge branch 'develop'
2015-05-20 12:54:52 +05:30
Pratik Vyas
10e813b010
bumped to version 5.0.5
2015-05-20 13:24:52 +06:00
Nabin Hait
a7bd8ee34b
Update utils.py
2015-05-20 12:53:04 +05:30
Pratik Vyas
90a51225a4
Merge branch 'develop'
2015-05-20 12:27:47 +05:30
Pratik Vyas
8980ce6052
bumped to version 5.0.4
2015-05-20 12:57:47 +06:00
Nabin Hait
c0f56de971
Merge pull request #3297 from nabinhait/develop
...
validate diabled fiscal year
2015-05-20 12:26:44 +05:30
Nabin Hait
8d50eb32c1
validate diabled fiscal year
2015-05-20 12:26:21 +05:30
Nabin Hait
50bbc99889
Merge pull request #3296 from nabinhait/develop
...
validate disabled fiscal year
2015-05-20 12:21:51 +05:30
Nabin Hait
0cf9469f86
validate disabled fiscal year
2015-05-19 18:44:02 +05:30
Pratik Vyas
d13db9cd84
Merge branch 'develop'
2015-05-19 17:33:00 +05:30
Pratik Vyas
07b3bf6417
bumped to version 5.0.3
2015-05-19 18:03:00 +06:00
Nabin Hait
25ea307b9f
Merge pull request #3289 from nabinhait/develop
...
Multiple fixes
2015-05-19 17:10:54 +05:30
Nabin Hait
8252117fe5
set tax amount also in base currency after manipulation
2015-05-19 16:30:17 +05:30
Nabin Hait
c602396366
validation message improved
2015-05-19 16:30:16 +05:30
Nabin Hait
f59d3a4e07
conversion rate fixes
2015-05-19 16:30:16 +05:30
Pratik Vyas
1a1ba38e95
Merge branch 'develop'
2015-05-19 15:45:57 +05:30
Pratik Vyas
80a116ab19
bumped to version 5.0.2
2015-05-19 16:15:57 +06:00
Nabin Hait
6684c470c5
Merge pull request #3287 from rmehta/customer-fix
...
Customer fix
2015-05-19 15:33:06 +05:30
Pratik Vyas
b8252bca00
bumped to version 5.0.1
2015-05-19 13:47:43 +06:00
Pratik Vyas
129a0a4cae
Fix merge mistakes
2015-05-19 13:12:00 +05:30
Pratik Vyas
803e998e9d
Fix merge mistakes
2015-05-19 13:08:54 +05:30
Rushabh Mehta
476019a930
[fix] throw name error for duplicate group
2015-05-19 13:03:01 +05:30
Rushabh Mehta
5495bc54a5
[enhancement] default terms in company, fixes #3231
2015-05-19 13:03:01 +05:30
Pratik Vyas
1a84d8ecd2
Merge branch 'develop'
2015-05-19 12:23:52 +05:30
Pratik Vyas
cc8f204b50
bumped to version v5.0.0
2015-05-19 12:33:57 +06:00
Nabin Hait
fcda5b636c
patch fix
2015-05-19 11:12:06 +05:30
Nabin Hait
fb7140df2f
Don't repost future sle while cancelling PR via landed cost voucher
2015-05-19 11:12:06 +05:30
Nabin Hait
0a705fe582
gross profit report fix
2015-05-19 11:12:06 +05:30
Rushabh Mehta
4a3c805049
[fix] sms settings, fixes #3276
2015-05-19 11:10:12 +05:30
Rushabh Mehta
632fb3879e
[fix] sms center, fixes #3274
2015-05-19 11:00:10 +05:30
Rushabh Mehta
df2491f6cf
[fix] default website fixes #3273
2015-05-19 10:47:10 +05:30
Rushabh Mehta
7231bd76a2
[minor] [fix] default status in Purchase Receipt
2015-05-18 14:36:57 +05:30
Rushabh Mehta
770c258406
[test-fix] case
2015-05-18 12:43:46 +05:30
Rushabh Mehta
ba57d7c59b
[test-fix] case
2015-05-18 12:37:11 +05:30
Rushabh Mehta
5b69a93871
[test-fix] circular reference
2015-05-18 12:15:35 +05:30
Rushabh Mehta
49765b3009
[minor] catch naming series while setting type
2015-05-18 11:35:52 +05:30
Rushabh Mehta
9dd8aab211
[fix] status updater
2015-05-18 11:19:10 +05:30
Rushabh Mehta
0718292bfa
[minor] naming series not set message
2015-05-18 11:19:10 +05:30
Nabin Hait
26c8a96b0a
set contact and customer in issue
2015-05-17 10:39:06 +05:30
Nabin Hait
1fe50120a3
minor fix
2015-05-16 12:14:54 +05:30
Rushabh Mehta
3d7793dae3
[hot] fix in issue
2015-05-15 20:59:19 +05:30
Nabin Hait
f78283fbff
customer and supplier dashboard info
2015-05-15 16:58:51 +05:30
Nabin Hait
b893972486
update tax amount after discount amount in purchase cycle
2015-05-15 15:16:30 +05:30
Nabin Hait
53ba64b653
fix update_projects patch
2015-05-15 15:16:30 +05:30
Pratik Vyas
85557816b1
Merge branch 'v4.x.x'
2015-05-15 14:16:26 +05:30
Pratik Vyas
4cf549d223
bumped to version 4.25.7
2015-05-15 14:46:26 +06:00
Rushabh Mehta
8360e2df71
[fix] [minor] update customer in issue fixes #3241
2015-05-15 14:09:23 +05:30
Rushabh Mehta
e2e1471f4d
[fix] fix breadcrumbs for sales browser fixes #3240
2015-05-15 14:05:10 +05:30
Rushabh Mehta
0eb2dae5d1
[fix] opportuniy fixes #3262
2015-05-15 13:51:35 +05:30
Nabin Hait
a6ee8290ce
Inclusive tax for deduction and manipulation of tax amount to fix rounding issue
2015-05-15 12:02:27 +05:30
Nabin Hait
6f9d3972f2
Merge pull request #3264 from nabinhait/v4.x.x
...
minor fix in reports
2015-05-15 10:47:27 +05:30
Nabin Hait
9f926080b6
minor fix in reports
2015-05-15 10:44:19 +05:30
Pratik Vyas
9726447169
Update translations
2015-05-14 15:14:06 +05:30
Nabin Hait
60ca1c2e87
Customer Addresses And Contacts report
2015-05-14 12:32:26 +05:30
Nabin Hait
90fc19ed9a
Item image in print view
2015-05-14 12:32:26 +05:30
Nabin Hait
2f243f4d08
Merge pull request #3242 from neilLasrado/crm
...
view leads button added to campaign
2015-05-13 19:34:36 +05:30
Nabin Hait
fb6f79d345
Merge pull request #3228 from neilLasrado/hr
...
Minor Fixes for HR
2015-05-13 19:33:46 +05:30
Nabin Hait
13fce8fc3a
Merge pull request #3152 from neilLasrado/project
...
Relative Dates for Tasks - WIP
2015-05-13 19:33:20 +05:30
Neil Trini Lasrado
58bf6c5950
Update task.py
2015-05-13 19:29:47 +05:30
Nabin Hait
e6e456b373
message fixed
2015-05-13 17:21:44 +05:30
Nabin Hait
96c4252762
reload account in patch
2015-05-13 14:55:12 +05:30
Nabin Hait
f6e4723101
minor fix in landed cost voucher
2015-05-13 12:53:11 +05:30
Nabin Hait
7a9646959a
Allowed purchase order in different uom than in Material request
2015-05-13 12:42:29 +05:30
Pratik Vyas
fa67d4e0e9
Merge branch 'v4.x.x'
2015-05-13 11:54:39 +05:30
Pratik Vyas
119c4cf176
bumped to version 4.25.6
2015-05-13 12:24:39 +06:00
Pratik Vyas
b19040c103
Update CONTRIBUTING.md
2015-05-13 00:47:21 +05:30
Nabin Hait
b45d4e0e16
In general ledger report opening amount is purely based on posting date
2015-05-12 17:40:14 +05:30
Nabin Hait
6c0c5702c5
patch fix : replace fields in print formats and custom scripts
2015-05-12 16:49:40 +05:30
Nabin Hait
4f0ebb91a6
Merge pull request #3247 from nabinhait/v4.x.x
...
remove toggling SO and DN field in SI based on pos
2015-05-12 15:27:38 +05:30
Nabin Hait
4ed40be3c2
remove toggling SO and DN field in SI based on pos
2015-05-12 15:26:45 +05:30
Nabin Hait
2d76825936
remove toggling SO and DN field in SI based on pos
2015-05-12 15:24:55 +05:30
Nabin Hait
4b9b92ba2f
minor fix in report
2015-05-12 15:12:30 +05:30
Nabin Hait
ffc7f3fef6
Apply default taxes on loading of document
2015-05-12 15:07:02 +05:30
Nabin Hait
23d6eb7e5c
patch fixed for making email acocounts
2015-05-12 15:02:33 +05:30
Nabin Hait
8ba849184f
Fix taxes and totals in party currency
2015-05-12 12:50:43 +05:30
Nabin Hait
8719c1a6b8
Fix taxes and totals in party currency
2015-05-12 12:28:26 +05:30
Rushabh Mehta
73249551e8
[fix] [hot] website product list make full urls
2015-05-12 11:37:47 +05:30
Rushabh Mehta
9cf1edc2c0
[fix] [hot] website product list make full urls
2015-05-12 11:32:25 +05:30
Rushabh Mehta
8f96c39be6
[minor] setup wizard via error report
2015-05-12 11:32:25 +05:30
Rushabh Mehta
92015a1268
[fix] [minor] escape in report
2015-05-12 11:32:25 +05:30
Rushabh Mehta
4f1a7e5aa8
[fix] newsletter list duplicate
2015-05-12 11:32:25 +05:30
Nabin Hait
ec361ea648
exchange rate fix
2015-05-11 18:14:45 +05:30
Neil Trini Lasrado
6c85479e4f
view leads button added to campaign
2015-05-11 17:56:36 +05:30
Nabin Hait
dd82bf2ad9
Exchange rate issue fixed
2015-05-11 16:49:31 +05:30
Pratik Vyas
3d77de9cf9
[fix] rename table fieldnamess patch
2015-05-11 16:08:14 +05:30
Nabin Hait
fedcb242ef
Rename table fieldnames only if doctype exists
2015-05-11 15:11:17 +05:30
Nabin Hait
affb3ec220
Item variants: validation added
2015-05-11 15:11:17 +05:30
Neil Trini Lasrado
2edc91bc52
Leave Type - LWP changed to Leave Without Pay
2015-05-11 14:38:21 +05:30
Neil Trini Lasrado
ec2f3d6e63
leave_allocation layout changed
2015-05-11 14:38:20 +05:30
Pratik Vyas
2fb0654f97
Show bulk limit error before sending
2015-05-11 14:29:52 +05:30
Rushabh Mehta
4439493232
[welcome-mails] add video links
2015-05-11 12:52:36 +05:30
Nabin Hait
93e0ec6663
Show only sub-contracted purchase order in stock entry for subcontracting
2015-05-11 11:32:38 +05:30
Nabin Hait
d1a64d89be
date issue fixed serial no
2015-05-11 11:32:38 +05:30
Nabin Hait
8f5b8c658a
fixes for renaming taxes and charges master
2015-05-11 11:32:38 +05:30
Rushabh Mehta
20a41b52cd
[temp-fix] missing product image
2015-05-09 12:18:17 +05:30
Nabin Hait
948286ed19
Merge pull request #3227 from nabinhait/v4.x.x
...
requested qty fix
2015-05-08 15:03:32 +05:30
Nabin Hait
6752b31091
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:49:50 +05:30
Nabin Hait
e27690ceda
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:43:10 +05:30
Rushabh Mehta
ab1ed013b3
[hot] taxes
2015-05-08 11:09:25 +05:30
Nabin Hait
15c284497b
fixed patch
2015-05-08 01:28:01 +05:30
Nabin Hait
fbdc0dc7d1
fixed patch
2015-05-08 01:24:28 +05:30
Nabin Hait
752479d08d
patch order changed
2015-05-08 01:15:39 +05:30
Nabin Hait
53f17009bc
Merge pull request #3215 from neilLasrado/prod-order
...
Production Order - Fixed cost not considering qty issue
2015-05-07 18:55:02 +05:30
Neil Trini Lasrado
3c3cdc7029
fixes
2015-05-07 18:52:12 +05:30
Pratik Vyas
6eca3693b1
Merge branch 'v4.x.x'
2015-05-07 18:30:37 +05:30
Pratik Vyas
7e143a5fdd
bumped to version 4.25.5
2015-05-07 19:00:37 +06:00
Rushabh Mehta
55dc66ffcc
[fix] index for sales order item
2015-05-07 18:16:49 +05:30
Neil Trini Lasrado
20e1c781b6
js call changed to trigger
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
a10bdd4980
fixes
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
e64d453d09
patch added
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
4f5cc9d672
Test case added to Production Order to check planned-operating-cost against qty
2015-05-07 17:31:24 +05:30
Neil Trini Lasrado
e63146408d
production order - fixes cost not considering qty issue
2015-05-07 17:31:24 +05:30
Nabin Hait
08c0c04ef2
Removed old page style Stock ledger end stock level report
2015-05-07 16:59:51 +05:30
Nabin Hait
c62c64c38b
patch fixed for taxes and charges template
2015-05-07 16:58:28 +05:30
Nabin Hait
28b18222c0
capacity planning patch fixed
2015-05-07 16:29:51 +05:30
Nabin Hait
574d5ff535
fetch only stock items as raw materials supplied for subcontracting
2015-05-07 16:29:29 +05:30
Nabin Hait
4bfbd29411
Permission for Stock ledger and balance report
2015-05-07 15:41:09 +05:30
Nabin Hait
d1cdde1c77
Merge pull request #3222 from nabinhait/v4.x.x
...
V4 fix
2015-05-07 15:39:02 +05:30
Nabin Hait
d5e2788cb4
Permission for Stock ledger and balance report
2015-05-07 15:28:21 +05:30
Rushabh Mehta
3545575c8b
[jsonrates api] add from global defaults
2015-05-07 15:16:37 +05:30
Rushabh Mehta
2682278ad9
Merge pull request #3221 from neilLasrado/hr
...
employee removed from HR setup
2015-05-07 14:59:45 +05:30
Neil Trini Lasrado
d1c413a668
employee removed from HR setup
2015-05-07 12:40:18 +05:30
Rushabh Mehta
66fa1ff878
[enhancement] automatic exchange rates via jsonrates
2015-05-07 12:26:09 +05:30
Rushabh Mehta
43a7b36fcf
Merge pull request #3217 from rmehta/taxes-and-charges-rename
...
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes ...
2015-05-07 11:23:59 +05:30
Rushabh Mehta
009378e187
[rename]
2015-05-06 22:59:00 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Neil Trini Lasrado
b4a298ddd4
multiple dependant tasks added
2015-05-06 14:47:34 +05:30
Neil Trini Lasrado
b3b373d0ac
fixes in Test Cases
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
350943128a
fixes in Pull request
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
c8f0c25088
referenceError name changed to circularReferenceError
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
1fa8ed8a1f
Test Cases Added, fixes in task
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
3da42fcdf9
fixed import errors
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
fa381c7a6c
task-rescheduling - handled exception if date is None
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
46d859e694
re-schedule dependaable task logic added
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
93583faaf0
depends-on added to task, circular reference validation added
2015-05-06 14:47:33 +05:30
Nabin Hait
a0b1124d6f
minor fix in report
2015-05-06 11:59:43 +05:30
Nabin Hait
0e1540b3b7
material request saving issue fixed
2015-05-05 17:26:35 +05:30
Nabin Hait
2b3e065efc
[fix] taxes and charges input value
2015-05-05 16:33:58 +05:30
Nabin Hait
40557750d5
party model patch fix
2015-05-05 16:00:21 +05:30
Nabin Hait
cf22fdbc85
party model patch fix
2015-05-05 14:22:10 +05:30
Nabin Hait
61092c0a88
Pos item view: show item name and item code
2015-05-05 12:27:11 +05:30
Rushabh Mehta
ea2b9039e9
Merge pull request #3143 from frappe/fix-travis
...
Update .travis.yml
2015-05-05 10:59:35 +05:30
Rushabh Mehta
4f41bb35b9
Merge pull request #3192 from neilLasrado/purchase-costing
...
Purchase costing in Projects
2015-05-05 10:59:11 +05:30
Rushabh Mehta
deed16066e
Merge pull request #3209 from rmehta/email-threading
...
[email] changes in email_account api
2015-05-05 10:55:50 +05:30
Nabin Hait
7104cf613f
party model patch fix
2015-05-04 19:21:36 +05:30
Rushabh Mehta
82ee5fdba6
[email] changes in email_account api
2015-05-04 18:17:22 +05:30
Nabin Hait
64568fb296
Default expense account and cost center are always visible in item
2015-05-04 16:16:12 +05:30
Nabin Hait
f73aa079a0
item list view indicator fix
2015-05-04 16:06:59 +05:30
Nabin Hait
72f71836d7
Party model patch fix
2015-05-04 13:01:44 +05:30
Nabin Hait
c91a9e5231
Delete company and company transactions are separate functions
2015-05-04 11:51:21 +05:30
Rushabh Mehta
e991c9e075
[fix] [typo] fixes #3193
2015-05-04 11:04:54 +05:30
Nabin Hait
874ead2ed9
Update warehouse as per master_name if master_name exists
2015-05-04 08:53:57 +05:30
Rushabh Mehta
c712cdb580
[fix] tax with both actual and rate type
2015-05-03 22:20:56 +05:30
Nabin Hait
bac82c273d
Merge pull request #3204 from nabinhait/v4.x.x
...
Maintain same currency exchnage rate while mapping
2015-05-02 18:49:56 +05:30
Nabin Hait
f550ecf93e
Maintain same currency exchnage rate while mapping
2015-05-02 18:46:42 +05:30
Nabin Hait
69cdf59d63
Maintain same currency exchnage rate while mapping
2015-05-02 18:46:29 +05:30
Nabin Hait
fb1f4a5c58
User permissions for Expense Claim
2015-05-02 18:46:29 +05:30
Nabin Hait
b0e9c06f93
Stock Entry agianst Manufaturing: fetch only stock items from bom
2015-05-02 18:46:29 +05:30
Rushabh Mehta
ba4aec3366
Merge pull request #3202 from kressi/develop
...
removed attributes from frappe.user.is_website_user()
2015-05-02 17:52:54 +05:30
kressi
d853353c28
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-02 10:24:56 +02:00
kressi
d1aa37f521
removed attributes from frappe is_website_user
2015-05-02 10:24:17 +02:00
Nabin Hait
d51b09282a
link warehouse with account
2015-05-01 20:31:11 +05:30
Pratik Vyas
05f8b6d870
Merge branch 'v4.x.x'
2015-05-01 16:42:37 +05:30
Pratik Vyas
ef7d6ae1f5
bumped to version 4.25.4
2015-05-01 17:12:36 +06:00
Nabin Hait
2a27e604af
Merge pull request #3195 from nabinhait/v4.x.x
...
fixes
2015-05-01 16:42:17 +05:30
Nabin Hait
ba43afc461
fix in chart of cost centers
2015-05-01 16:41:15 +05:30
Nabin Hait
9dd9150d2c
fix for duplicate item
2015-05-01 16:41:15 +05:30
Nabin Hait
f25822cd8d
fix in patches
2015-05-01 15:50:52 +05:30
Nabin Hait
2ca18ff913
Stock Entry validation in Journal Entry
2015-05-01 12:46:59 +05:30
Rushabh Mehta
5dbf8a7418
[cleanup] frappe.get_user
2015-05-01 11:51:26 +05:30
Nabin Hait
7981ea0e6c
duplicate item message
2015-05-01 11:10:37 +05:30
Nabin Hait
816cb8c141
Migrate customized precision for newly created total fields
2015-05-01 11:10:37 +05:30
Anand Doshi
e6ac87e86f
Gross Profit Report: Company filter should be reqd
2015-04-30 15:33:31 -07:00
Rushabh Mehta
ec3ad7d865
[enhancement] close opportunities from list view
2015-04-30 17:17:50 +05:30
Pratik Vyas
397a2bf1d0
Merge branch 'v4.x.x'
2015-04-30 16:31:02 +05:30
Pratik Vyas
7358e6a100
bumped to version 4.25.3
2015-04-30 17:01:02 +06:00
Nabin Hait
aa03a8e3a2
Migrate customized precision for newly created total fields
2015-04-30 16:13:47 +05:30
Nabin Hait
1bf03289a6
Service items should not be considered as raw material in production planning tool
2015-04-30 16:13:47 +05:30
Nabin Hait
c5b8f7eb46
fix in trends report
2015-04-30 16:13:46 +05:30
Nabin Hait
4ffee99ba3
Removed duplicate item validation
2015-04-30 16:13:46 +05:30
Neil Trini Lasrado
42a554e5cb
fixes in Purchase Invoice
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
01720404db
fixes in Test Cases
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
349461e9e6
Test Cases Added
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
9a56764bf2
Total Purchase Cost added to Projects
2015-04-30 13:06:02 +05:30
Rushabh Mehta
5e13799704
[fixes] leave approver selection and cleaned up layout
2015-04-30 12:55:10 +05:30
Nabin Hait
693d1b2b2c
Merge pull request #3190 from nabinhait/v4.x.x
...
Fixes
2015-04-30 12:23:14 +05:30
Nabin Hait
6e659a4f27
Service items should not be considered as raw material in production planning tool
2015-04-30 11:51:24 +05:30
Nabin Hait
acfdce6ade
Removed duplicate item validation
2015-04-30 11:51:24 +05:30
Nabin Hait
4716278f69
minor fix in chart of cost centers
2015-04-29 19:12:46 +05:30
Nabin Hait
2db8dc922a
fixed trial balance related to showing zero balance
2015-04-29 18:39:33 +05:30
Nabin Hait
5207d1205e
minor issue fixed for precision
2015-04-29 15:38:14 +05:30
Nabin Hait
b6a1bcc730
Merge pull request #3186 from nabinhait/v4.x.x
...
V4.x.x
2015-04-29 14:26:19 +05:30
Nabin Hait
6e59aca394
[enhancement] sort root accounts as assets, liability, equity, income, expense
2015-04-29 13:08:00 +05:30
Nabin Hait
59ab65ded6
fixed trial balance related to showing zero balance
2015-04-29 13:08:00 +05:30
Rushabh Mehta
0590cdceab
[enhancement] sort root accounts as assets, liability, equty, income, expense
2015-04-29 12:26:15 +05:30
Nabin Hait
081935eff7
[fix] fetch bank/cash account
2015-04-28 19:08:42 +05:30
Nabin Hait
2ff177a4fb
fix for opening purchase invoice
2015-04-28 17:17:37 +05:30
Nabin Hait
47e5c764c3
[fix] accounts payable report
2015-04-28 16:45:32 +05:30
Rushabh Mehta
45ca8a4d31
[minor] save last company in multi-company scenario
2015-04-28 16:04:56 +05:30
Nabin Hait
b1b95526c6
Update sales_invoice.js
2015-04-28 13:56:48 +05:30
Nabin Hait
872eaf1541
Update purchase_invoice.js
2015-04-28 13:56:17 +05:30
Nabin Hait
aef76bfa1d
Update journal_entry.js
2015-04-28 13:55:04 +05:30
Nabin Hait
042f86e555
advance paid should not be copied and patch to fix affected records
2015-04-28 13:00:23 +05:30
Nabin Hait
67fdbcf242
precision fixed in batch-wise balance report
2015-04-28 12:53:26 +05:30
Nabin Hait
b142a5eda0
Merge pull request #3174 from nabinhait/v4.x.x
...
precision fixed in batch-wise balance report
2015-04-28 12:37:38 +05:30
Nabin Hait
5ce31174be
precision fixed in batch-wise balance report
2015-04-28 12:36:53 +05:30
Nabin Hait
3be69d4d81
patch for updating temporary account type
2015-04-27 18:33:05 +05:30
Nabin Hait
5616ff417c
Account type Temporary and removed Aging Date field from all documents
2015-04-27 18:08:51 +05:30
Pratik Vyas
8f7621c40d
Merge branch 'v4.x.x'
2015-04-27 17:29:53 +05:30
Pratik Vyas
b17f056f8d
bumped to version 4.25.2
2015-04-27 17:59:52 +06:00
Nabin Hait
31f6c984f0
Update .travis.yml
2015-04-27 16:48:33 +05:30
Nabin Hait
3ee5db123f
Merge pull request #3164 from nabinhait/v4.x.x
...
advance paid should not be copied and patch to fix affected records
2015-04-27 16:45:26 +05:30
Rushabh Mehta
50ce9753e0
[minor] added cache in get_value
2015-04-27 13:13:50 +05:30
Nabin Hait
3c3855ac8c
advance paid should not be copied and patch to fix affected records
2015-04-27 11:25:56 +05:30
Anand Doshi
8be3ba36d9
fixed relative urls in some web pages
2015-04-24 13:22:08 -04:00
Nabin Hait
9c8b6eb815
minor fix in completed production orders report
2015-04-24 18:36:02 +05:30
Nabin Hait
52cf6e947c
patch fix
2015-04-24 16:07:32 +05:30
Rushabh Mehta
6894b9e457
[minor] only one Temporary Opening account
2015-04-24 14:22:54 +05:30
Nabin Hait
01e4c8f0f8
fix in chart of accounts
2015-04-23 16:29:15 +05:30
Rushabh Mehta
a30c76f430
[ux] [layouts] project page
2015-04-23 15:23:47 +05:30
Nabin Hait
218a1267c9
Merge pull request #3146 from neilLasrado/project
...
FIxes - Time Log Hours calculation
2015-04-23 14:37:23 +05:30
Nabin Hait
ffa6d94f7a
Merge pull request #3150 from rmehta/is_group
...
[rename] group_or_ledger to is_group
2015-04-23 14:37:00 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Neil Trini Lasrado
8e4cf13d01
fixes time log hours calculation
2015-04-22 16:23:36 +05:30
Neil Trini Lasrado
d3179a733b
datatype of hour_rate in Production order operations and bom operation changed to float
2015-04-22 16:11:48 +05:30
Neil Trini Lasrado
6a066e07e5
Time Log - to_time trigger called on_load to calculate hours if Tl is created via Calender
2015-04-22 16:11:48 +05:30
Nabin Hait
4669fe3e85
minor fix
2015-04-22 15:34:44 +05:30
Nabin Hait
1e3fb54b82
Merge pull request #3006 from neilLasrado/project
...
Project Costing
2015-04-22 12:36:15 +05:30
Neil Trini Lasrado
ecb5d11e2d
Today added as default date for posting date in expense claim
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
051d0ab79a
function name validate cost changed to update cost in Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
5e317d2b72
fixes in Expense Claim and get_avtivity_cost function
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
832dfe7980
fixes in Time Log Batch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
086c0463be
Fixes in Patch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e1951306eb
fix in time log batch list
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
da8c6f6ae2
test case fix for Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
50a0fd6204
feild rename fixes in Project
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e7ddb72e7f
patch for renaming project feilds
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4cffbe26dc
rate removed from time log batch
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
d4b33d3c14
Costing added in Time log Batch, Sales Order added to Project + more fixes
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4e6e4726a4
filters added, ui change, update project moved to project.py
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
ec5c66f8f0
Title Feild added to Expense Claim
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88
fixes in Test Cases
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
9789d06b3e
task and project- billing amount and actual amount added
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
650e679a5e
Fixes in Project
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
78b96ca769
Fixes in time_log
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
c33ad6b36a
fixes in Activity Cost
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
2679b247b3
fixes in Expense Claim
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
7f9ea3bf6a
expense claim test records
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
33d58ac431
Test Cases
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
709c43674b
feild rename - internal rate/cost into costing rate/amount
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
aabf150423
task made mandatory in project
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
a11770f06f
in Time Log - Server side validations added to recalculate cost on save
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
50234cb0fe
Task added to expense claim
...
all cost (expense claim and time log) against Task; task updates project cost.
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
8026137998
employee name added to activity cost
...
title changed for activity type
time log -fetch logic added for billing and internal rate
validations and calculation logic added
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
458b8885f0
New Document Activity Cost created.
...
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
2015-04-22 11:25:57 +05:30
Rushabh Mehta
0f2b7bd2bf
Update setup.py
2015-04-22 10:50:02 +05:30
Pratik Vyas
6814a39186
Update .travis.yml
2015-04-21 19:19:34 +05:30
Rushabh Mehta
3c77b332ae
Merge pull request #3142 from neilLasrado/production-planning
...
Manufacturing Settings
2015-04-21 19:13:13 +05:30
Neil Trini Lasrado
d93750a868
Manufacturing Settings - Datatype of capacity_planning_for_days and mins_between_operations changed to Int
2015-04-21 17:40:37 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Rushabh Mehta
7337c80f09
Merge pull request #3141 from neilLasrado/production-planning
...
Fix - #3123
2015-04-21 16:47:01 +05:30
Neil Trini Lasrado
261e27b9ec
type of Hour rate in Production order operations and bom operations changed to currency (previouslly float). Desc to Actual Operation Cost changed
2015-04-21 16:43:43 +05:30
Nabin Hait
e68e86f109
execute on_doctype_update
2015-04-21 15:26:42 +05:30
Rushabh Mehta
50918a8fcf
[pos] fixes #3138 , #3140
2015-04-21 14:38:48 +05:30
Rushabh Mehta
4665f7eb70
[enhancement] added description, batch_no in packing slip
2015-04-21 11:20:24 +05:30
Rushabh Mehta
80381475c4
[ux] re-arranged columns in bank reconciliation, fixes #3114
2015-04-21 11:08:53 +05:30
Rushabh Mehta
dfa93305ab
[minor] fixes #3127
2015-04-21 10:36:39 +05:30
Rushabh Mehta
7f9c4d8677
[fix] item grid fix, via #3136
2015-04-21 10:19:53 +05:30
Nabin Hait
5c7f0bcb32
Party filter and columns in general ledger report
2015-04-20 17:13:53 +05:30
Rushabh Mehta
e9bd77d674
[minor] fixes in welcome mails
2015-04-20 13:00:56 +05:30
Nabin Hait
44aaa56000
get standard chart of account if country code not found
2015-04-20 11:51:54 +05:30
Pratik Vyas
3b8682f534
Merge branch 'v4.x.x'
2015-04-20 10:44:21 +05:30
Pratik Vyas
dbb3b49625
bumped to version 4.25.1
2015-04-20 11:14:21 +06:00
Pratik Vyas
b78ab03b2b
Merge 'upstream/master' into v4.x.x (account receivable hotfix)
2015-04-20 10:41:31 +05:30
Rushabh Mehta
80f8b7be2f
[minor] [perms] Expense Claim Type
2015-04-19 16:18:15 +05:30
Rushabh Mehta
d7330ec709
[minor] add disabled property in fiscal year:
2015-04-18 17:04:04 +05:30
Rushabh Mehta
92b253dceb
Update accounts_receivable.py
2015-04-18 12:13:57 +05:30
Nabin Hait
1b26c6f02a
Merge pull request #3125 from nabinhait/v4.x.x
...
hotfix in patch
2015-04-17 16:16:35 +05:30
Nabin Hait
0287b1f75c
hotfix in patch
2015-04-17 16:15:25 +05:30
Pratik Vyas
e19578bac1
Merge branch 'v4.x.x'
2015-04-17 16:02:11 +05:30
Pratik Vyas
e7eb92ce70
bumped to version 4.25.0
2015-04-17 16:32:11 +06:00
Nabin Hait
6ae352bf12
Merge pull request #3124 from nabinhait/v4.x.x
...
issue fixed in accounts receivable report
2015-04-17 15:58:27 +05:30
Nabin Hait
4743cbe002
issue fixed in accounts receivable report
2015-04-17 15:55:19 +05:30
Nabin Hait
ddaedefb32
minor fix for fieldname
2015-04-17 15:01:41 +05:30
Rushabh Mehta
f6215c7740
Merge pull request #3122 from nabinhait/v4.x.x
...
delete gle for cancelled invoices
2015-04-17 14:20:50 +05:30
Rushabh Mehta
9e6812cfab
Merge pull request #3108 from BhupeshGupta/fix_bank_reports
...
Add/Fix Bank Reports Filters
2015-04-17 14:17:22 +05:30
Nabin Hait
2ba88c4a5f
patch: delete gle for cancelled invoices
2015-04-17 12:05:00 +05:30
Rushabh Mehta
b092339c3a
[minor] ignore list for dropbox
2015-04-17 12:01:40 +05:30
Rushabh Mehta
0939a5ac4c
feature to delete company
2015-04-17 11:52:45 +05:30
Anand Doshi
63ea99e929
[hotfix] item group set_parent_website_route
2015-04-16 20:45:54 -04:00
Nabin Hait
1a6299176a
delete gl entries on cancellation of sales invoice, if grand total is zero
2015-04-16 19:22:42 +05:30
Nabin Hait
2029ea9abf
toggle editable price list rate
2015-04-16 17:55:35 +05:30
Nabin Hait
2182cd5487
Update journal_entry.js
2015-04-16 16:00:37 +05:30
Rushabh Mehta
acf489c5ef
[hot] [fix] journal entry
2015-04-16 15:35:49 +05:30
Rushabh Mehta
d839a730cf
[hot] [fix] journal entry
2015-04-16 15:27:46 +05:30
Rushabh Mehta
5674c4f28c
[splash] new image
2015-04-16 15:09:42 +05:30
Rushabh Mehta
d64e928b50
[favicon] darker
2015-04-16 14:04:51 +05:30
Rushabh Mehta
5ecceb55fe
Merge pull request #3119 from nabinhait/v4.x.x
...
Reset no-copy fields for recurring docs and patch to fix
2015-04-16 14:02:35 +05:30
Nabin Hait
c3daa91c8a
Reset no-copy fields for recurring docs and patch to fix
2015-04-16 13:13:18 +05:30
Rushabh Mehta
2e7c36ec99
[favicon] light grey for erpnext
2015-04-16 12:41:42 +05:30
Rushabh Mehta
600aa622b1
[fix] [minor] journal entry, via error report
2015-04-16 11:43:26 +05:30
Rushabh Mehta
12ade3573b
[minor] fix default permissions for purchase taxes and charges master
2015-04-16 11:43:25 +05:30
Pratik Vyas
a7b7e62e26
[travis] Add gitter webhook
2015-04-16 10:45:03 +05:30
bhupeshg2
3f59615555
switch to tabs
2015-04-15 22:29:45 +05:30
Rushabh Mehta
2887913797
[fix] opportunity -> quotation
2015-04-15 15:40:05 +05:30
Rushabh Mehta
2dea40f7be
[leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042
2015-04-15 15:08:48 +05:30
Pratik Vyas
850ee3c53d
Fix make_email_account patch
2015-04-15 14:36:32 +05:30
Rushabh Mehta
749e20f66d
Merge pull request #3076 from kidakaka/patch-1
...
Minor Update README.md
2015-04-15 12:29:52 +05:30
Rushabh Mehta
53bc304be2
Merge pull request #3037 from neilLasrado/production-planning
...
Production planning
2015-04-15 12:06:44 +05:30
Rushabh Mehta
e027d3f34f
[fix] a better solution for #2776
2015-04-15 12:03:21 +05:30
bhupeshg2
e2e973f7be
Add reqd to bank clearance aummary report
...
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
2015-04-14 23:09:32 +05:30
Anand Doshi
68dfc934bf
[hotfix] [report] Received Items to be Billed
2015-04-14 11:56:42 -04:00
Rushabh Mehta
3ee1f11771
[cleanup] quality inspection fixes #3061
2015-04-14 17:53:36 +05:30
Rushabh Mehta
5e7f8fd156
[ux] bom fixes #3072
2015-04-14 14:24:21 +05:30
Rushabh Mehta
de9bd108d0
[usability] journal entry type fixes #3085
2015-04-14 14:10:19 +05:30
Rushabh Mehta
39539f14ce
[patch-fix] make_email_accounts
2015-04-14 13:07:28 +05:30
Neil Trini Lasrado
18dc151fc7
Fixes in make_time_log function in Production Order
2015-04-14 13:06:07 +05:30
Neil Trini Lasrado
cf96cc26a0
Fixes for test cases
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
1371afce2e
added default date to planned start date in Prod Order & made planned end date read-only
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
c43ac20115
Fixes in logic for production order scheduling
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
d3d94d1efe
fix- Material Transferred for Manufacturing not Updating in Production Order Error
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
cd1816cc5a
removed unnecesssary functions. Production related feilds made mandatory in TIme Log
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
5ab7d930b6
make time log button in Production order operations fixed
...
show time logs button made available for compleated operations
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
8d5d5cc0a7
Planned Start Date made mandatory in production order
...
server side check added to not plan operations if planned_start_date is None
Production Order on submit - unwanted error messsages problem fixed.
2015-04-14 13:00:54 +05:30
Rushabh Mehta
2c78796716
[fix] opportunity / make quotation
2015-04-14 11:24:42 +05:30
Rushabh Mehta
adfc34ba00
[opportunity] status open
2015-04-13 22:23:50 +05:30
Rushabh Mehta
f579cf9871
[opportunity] status open
2015-04-13 16:58:47 +05:30
Rushabh Mehta
4ac3094049
[opportunity] status open
2015-04-13 16:56:03 +05:30
Rushabh Mehta
c712dc6729
[opportunity] status open
2015-04-13 16:51:27 +05:30
Rushabh Mehta
99a4d63d97
[opportunity] status open
2015-04-13 16:24:35 +05:30
Rushabh Mehta
fd0f1cb8b7
[opportunity] not submittable
2015-04-13 16:21:58 +05:30
Rushabh Mehta
20bcf6aeff
[fixes] print_hide on stock uom and gross profit
2015-04-13 15:31:24 +05:30
Rushabh Mehta
39c84fe31c
[hot] coa
2015-04-13 12:16:25 +05:30
Rushabh Mehta
b4c4351513
[report] fix via error report
2015-04-13 11:30:10 +05:30
Pratik Vyas
2437d4cce2
Fix #3046 Customer Acquisition and Loyalty repor
2015-04-10 12:35:43 +05:30
Pratik Vyas
950bf72471
Merge pull request #3087 from pdvyas/lang
...
update translations
2015-04-10 10:29:54 +05:30
Pratik Vyas
7f8cc32d38
update translations
2015-04-10 10:26:08 +05:30
Anand Doshi
a0630671da
[hotfix] batch query
2015-04-09 13:34:57 +05:30
Pratik Vyas
9490d9dee3
Merge branch 'v4.x.x'
2015-04-09 13:16:47 +05:30
Pratik Vyas
c95e4e89d5
bumped to version 4.24.4
2015-04-09 12:56:05 +06:00
Nabin Hait
b362bb076d
Merge pull request #3083 from nabinhait/v4.x.x
...
company in reports
2015-04-09 11:50:19 +05:30
Nabin Hait
031b1251cf
Merge branch 'anandpdoshi-anand-mar-30' into v4.x.x
2015-04-09 11:42:47 +05:30
Nabin Hait
4642d0697e
fixed conflict
2015-04-09 11:42:24 +05:30
Nabin Hait
4f0231e34b
Merge pull request #3075 from nabinhait/v4.x.x
...
V4.x.x
2015-04-09 11:22:20 +05:30
Anand Doshi
00a07de426
fixed test earning type
2015-04-08 21:49:11 +05:30
Anand Doshi
c994647704
fixed test cases
2015-04-08 21:22:36 +05:30
Anand Doshi
2f87fb41fa
Merge pull request #3069 from neilLasrado/dob
...
validation added - dob cannot accept a future date
2015-04-08 13:25:01 +05:30
Prasad Ajinkya
2a29e53cb2
Update README.md
...
WordPress is always with a capital "P". If you want people to respect your brand, you need to start respecting other brands' guidelines as well :)
2015-04-08 13:24:25 +05:30
Anand Doshi
a1a3468704
Merge pull request #3068 from neilLasrado/leaves
...
Bug Fixes
2015-04-08 13:20:18 +05:30
Anand Doshi
519f0f8b0c
Merge pull request #2966 from neilLasrado/HR
...
Offer Letter
2015-04-08 13:06:36 +05:30
Neil Trini Lasrado
4b29ccc2b0
Salary Structure - Earnings made mandatory
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef
fix - update button didnt work in leave allocation after submit
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515
validation added - dob cannot accept a future date
2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b
fixes in offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a
print format added
2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513
[fixes] offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2
terms view added
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168
Offer Letter - New Doctype added and job_applicant naming changed
2015-04-08 12:28:20 +05:30
Nabin Hait
0277ae298a
pending amount to be delivered in report
2015-04-07 17:49:53 +05:30
Pratik Vyas
d102cba71c
[patch] [fix] Fix missing image column error
2015-04-07 15:32:15 +05:30
Anand Doshi
e4e112a6bc
setup wizard - don't send welcome mail
2015-04-07 11:03:58 +05:30
Nabin Hait
6eb55d4d3d
allowed import for delivery note
2015-04-07 09:42:44 +05:30
Anand Doshi
03cf407574
[fix] removed print
2015-04-06 19:38:13 +05:30
Anand Doshi
c399709789
fixes to test cases
2015-04-06 19:29:16 +05:30
Anand Doshi
0dc79f4de0
Merge remote-tracking branch 'frappe/v4.x.x' into develop
...
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
2015-04-06 13:21:07 +05:30
Anand Doshi
731b15edf4
[hotfix] taxes and totals
2015-04-05 20:09:09 +05:30
Anand Doshi
22af7deadd
minor fixes
2015-04-05 17:18:07 +05:30
Anand Doshi
7854779c22
[hotfix] strip email when importing newsletter list
2015-04-05 13:44:52 +05:30
Anand Doshi
e4580447d0
[fix] on setup wizard language selection and load, set it as system default language
2015-04-04 16:15:04 +05:30
Anand Doshi
85e5d46370
[fix] opportunity email pulling
2015-04-03 15:03:01 +05:30
Anand Doshi
c13c4f014e
[fix] editable amount in Purchase Taxes and Charges
2015-04-03 14:55:51 +05:30
Anand Doshi
432c12ad93
[fix] email account patch fix and minor setup wizard fix
2015-04-03 14:30:15 +05:30
Rushabh Mehta
8bd54f27c5
Merge pull request #3051 from rmehta/opportunity
...
Opportunity
2015-04-03 11:01:59 +05:30
Rushabh Mehta
f63a3d4a80
[fiscal year] automatically set year end date if more than one year
2015-04-03 10:59:48 +05:30
Anand Doshi
9d3adc3abf
Merge pull request #3048 from anandpdoshi/anand-april-2-v5
...
Party Model Patch
2015-04-03 08:22:59 +05:30
Rushabh Mehta
bb2041d22c
[patch] fix
2015-04-02 22:11:16 +05:30
Rushabh Mehta
7c32770a69
move opportunity item to CRM
2015-04-02 22:06:36 +05:30
Rushabh Mehta
3c626faf8f
[incoming sales email] to opportunity
2015-04-02 22:02:33 +05:30
Rushabh Mehta
4c46687fb1
[incoming sales email] to opportunity
2015-04-02 22:00:34 +05:30
Rushabh Mehta
05e39992d0
[setup-wizard] don't catch duplicate
2015-04-02 18:55:36 +05:30
Anand Doshi
5445c460b7
[fix] [patch] party model patch
2015-04-02 17:42:27 +05:30
Rushabh Mehta
750ceedbc1
[production order] explict idx + test fix
2015-04-02 16:03:11 +05:30
Rushabh Mehta
99a41952a4
[lead] [email] fixes
2015-04-02 15:53:11 +05:30
Anand Doshi
54448aabd6
Setup wizard fixes
2015-04-02 15:39:44 +05:30
Rushabh Mehta
ffc190d34d
Merge pull request #3013 from neilLasrado/expense
...
Expense Claim - 'Total Amount Reimbursed' feild added
2015-04-02 14:29:29 +05:30
Rushabh Mehta
0f7e79a421
Merge pull request #3040 from anandpdoshi/anand-april-2-v5
...
Show Write-Off for all Sales Invoices if there is a Grand Total
2015-04-02 14:05:24 +05:30
Anand Doshi
83f87da3d1
Show Write-Off for all Sales Invoices if there is a Grand Total
2015-04-02 13:43:51 +05:30
Rushabh Mehta
d7a5b7309b
[minor] fix
2015-04-01 23:38:37 +05:30
Anand Doshi
bfa3a08576
fixed welcome emails
2015-04-01 23:34:16 +05:30
Anand Doshi
3aaab1a39e
setup wizard fixes
2015-04-01 22:01:54 +05:30
Rushabh Mehta
99d90e1f34
[setup] send welcome emails after setup
2015-04-01 20:32:57 +05:30
Anand Doshi
7b6daafbb9
[minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person
2015-04-01 16:26:59 +05:30
Anand Doshi
8ea1ed143b
Show write-off section if pos or advance payment
2015-04-01 16:25:55 +05:30
Rushabh Mehta
4c8d01ba9e
[issue] close, reopen buttons
2015-04-01 15:43:14 +05:30
Rushabh Mehta
918ddf2537
[task] open, close from list:
2015-04-01 15:43:14 +05:30
Anand Doshi
ee57a8d2a4
[hotfix] unique job applicant
2015-04-01 12:29:30 +05:30
Anand Doshi
dd77287cb9
[fix] fiscal year auto-create
2015-04-01 08:26:32 +05:30
Anand Doshi
5745cf7600
fixed rename field patches
2015-03-31 17:31:53 +05:30
Anand Doshi
92af795f12
Fixed note permission query
2015-03-31 14:42:22 +05:30
Rushabh Mehta
aefc01372f
[listview] issue: open, close | so, po: stop, unstop
2015-03-31 13:39:42 +05:30
Pratik Vyas
4ce7977dec
Update .travis.yml
2015-03-31 13:16:29 +05:30
Pratik Vyas
1b41b50a95
Update .travis.yml
2015-03-31 13:13:52 +05:30
Pratik Vyas
52d3697d98
Update .travis.yml
2015-03-31 13:11:32 +05:30
Anand Doshi
fc79492bac
Lead Status in List, minor fix in Make Email Accounts patch
2015-03-30 22:35:51 +05:30
Anand Doshi
d6a360b51b
[fix] check job application unique email id
2015-03-30 21:11:34 +05:30
Pratik Vyas
4ec1a9e8f6
Move frappe field renames to frappe
2015-03-30 19:37:02 +05:30
Anand Doshi
31dce7fa49
Merge pull request #3025 from sbktechnology/v4.x.x
...
some fix in batch related cleanup
2015-03-30 16:13:29 +05:30
Sambhaji Kolate
a4fa96cc79
some fix in batch related cleanup
2015-03-30 16:04:55 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Pratik Vyas
52e8c3d42b
Merge branch 'v4.x.x'
2015-03-30 12:41:48 +05:30
Pratik Vyas
10224c9d86
bumped to version 4.24.3
2015-03-30 13:11:48 +06:00
Anand Doshi
adcf857c37
fixed newsletter unsubscribe and default footer
2015-03-27 17:42:18 +05:30
Nabin Hait
abfe09b8ee
Merge pull request #3017 from nabinhait/v4.x.x
...
Landed cost voucher: fixes for serialized item
2015-03-27 17:05:20 +05:30
Nabin Hait
54c865e77c
Landed cost voucher: fixes for serialized item
2015-03-27 15:39:06 +05:30
Nabin Hait
f977ad036e
reload block module
2015-03-27 10:49:41 +05:30
Nabin Hait
e5604dc944
production order operation order by idx
2015-03-26 17:40:57 +05:30
Nabin Hait
789ef7e346
stock balance report fixed
2015-03-26 17:40:57 +05:30
Neil Trini Lasrado
a6b3415cdd
Expense Claim - 'Total Amount Reimbursed' feild added
2015-03-26 14:13:44 +05:30
Nabin Hait
712440c045
Merge pull request #3012 from nabinhait/v4.x.x
...
purchase order items to be billed report
2015-03-26 12:50:40 +05:30
Nabin Hait
7057970c0c
purchase order items to be billed report
2015-03-26 11:05:13 +05:30
Rushabh Mehta
eb928b950f
[fix] journal entry 3 cols, default weekly digest
2015-03-25 17:34:20 +05:30
Nabin Hait
d25fda7537
patch fixes
2015-03-25 15:55:09 +05:30
Nabin Hait
06b0b36ae6
Patch fixes
2015-03-25 14:51:35 +05:30
Anand Doshi
d3a32bc9e5
[minor] fixed newsletter patch
2015-03-25 14:51:11 +05:30
Nabin Hait
37eaa0cca3
Merge pull request #3003 from neilLasrado/activity-type
...
time_log_for select field in TL changed to against_manufacturing (check)
2015-03-24 18:03:25 +05:30
Neil Trini Lasrado
3fcd89f63e
against_manufacturing renamed to for_manufacturing
2015-03-24 17:51:31 +05:30
Rushabh Mehta
308e6ea21e
[fixes] default_website and stock reco
2015-03-24 17:35:16 +05:30
Nabin Hait
b6061e5d3f
deleted chart of accounts and style settings doctype
2015-03-24 17:11:58 +05:30
Neil Trini Lasrado
bccec29415
In Time Log
...
- time_log_for removed.
- against manufacturing check box introduced
- all logic depending time_log_for shifted to against_manufacturing
- activity type made non-mandatory
- fixes in operations select feild data population in Time log
In Activity Type
- Validations for activity type manufacturing removed.
- Patch for creating activity type manufacturing removed
- activity type manufacturing removed from install fixtures
2015-03-24 16:53:54 +05:30
Nabin Hait
a3eec1603a
fixed against jv query
2015-03-24 14:49:09 +05:30
Nabin Hait
53450b08b0
Fixes in general ledger report
2015-03-24 13:13:25 +05:30
Nabin Hait
03f7a8e44a
minor fix in newsletter patch
2015-03-24 11:58:21 +05:30
Nabin Hait
e9d83303d3
create manufacturing activity type via patch only if setup completed
2015-03-23 17:05:32 +05:30
Pratik Vyas
f2eed445e5
Update .travis.yml
2015-03-23 16:23:28 +05:30
Nabin Hait
d2af60c825
Root Equity added in standard chart of accounts and finalized chart of India And UAE
2015-03-23 16:08:32 +05:30
Rushabh Mehta
04f907efcf
[fix] job applicant (test via import)
2015-03-23 15:44:54 +05:30
Rushabh Mehta
fea22de3e8
[minor] material request and newsletter list
2015-03-23 15:44:54 +05:30
Nabin Hait
da5cfb1630
Exchange rate upto 9 decimals
2015-03-23 14:51:45 +05:30
Nabin Hait
3c89605e57
minor fix in taxes and totals
2015-03-23 14:33:22 +05:30
Nabin Hait
ca7e778f82
modified date updated
2015-03-23 14:17:59 +05:30
Rushabh Mehta
c2eae25d0e
[cleanup] validate_email_add
2015-03-23 14:10:51 +05:30
Nabin Hait
97cc4dd582
precision issue fixed in report
2015-03-23 13:10:50 +05:30
Nabin Hait
395724dcdb
Merge pull request #2988 from neilLasrado/make-quote
...
make quotation button added to lead
2015-03-23 12:52:09 +05:30
Nabin Hait
544af6d4cf
fix
2015-03-23 12:35:39 +05:30
Neil Trini Lasrado
bef6fa152e
make quotation button added to lead
2015-03-23 11:01:22 +05:30
Pratik Vyas
c7402e2989
Merge branch 'v4.x.x'
2015-03-20 17:32:07 +05:30
Pratik Vyas
e07e5bbe00
bumped to version 4.24.2
2015-03-20 18:02:07 +06:00
Nabin Hait
04069bbc00
Merge pull request #2985 from nabinhait/v4.x.x
...
V4.x.x
2015-03-20 16:28:57 +05:30
Nabin Hait
63e00dcfd2
Set qty as per stock_uom while mapping Material request to Purchase order
2015-03-20 16:25:53 +05:30
Rushabh Mehta
aca5c7b580
[test] newsletter list
2015-03-20 16:06:34 +05:30
Rushabh Mehta
208a06f5f5
[test] newsletter list
2015-03-20 15:57:25 +05:30
Rushabh Mehta
acdd5189d1
[test-fix]
2015-03-20 15:52:11 +05:30
Rushabh Mehta
288a833422
[test-fix]
2015-03-20 15:37:31 +05:30
Rushabh Mehta
a7c377887b
[test-fix]
2015-03-20 15:15:38 +05:30
Nabin Hait
2ed71bac20
Batch related cleanup
2015-03-20 15:06:30 +05:30
Rushabh Mehta
8f343165ad
[patch-fix] convert_stock_reco
2015-03-20 15:04:13 +05:30
Nabin Hait
5601d9fbda
match condition in get_query
2015-03-20 14:40:36 +05:30
Rushabh Mehta
a7e21eb484
[newsletter-list] fixes, patch fix
2015-03-20 14:38:12 +05:30
Anand Doshi
2b2b639492
fixes
2015-03-20 14:29:23 +05:30
Nabin Hait
c1199c0d27
minor fix in patch
2015-03-20 10:29:30 +05:30
Rushabh Mehta
611b513a2d
[newsletter] fixed tests
2015-03-19 17:16:03 +05:30
Rushabh Mehta
14ae4c3603
[email] many fixes, newsletter, unsubscribe
2015-03-19 17:16:03 +05:30
Nabin Hait
fd2bf93b50
test case fix
2015-03-18 17:56:09 +05:30
Anand Doshi
9d8154dd40
fixed test cases
2015-03-18 16:22:13 +05:30
Nabin Hait
60aee54c6c
currency in test records
2015-03-18 16:06:13 +05:30
Nabin Hait
2df422de25
Test case fixes
2015-03-18 14:57:09 +05:30
Nabin Hait
87ee502dfd
Merge pull request #2949 from sbktechnology/develop
...
update get_batch_no query to sort batch with expiry date
2015-03-18 14:29:13 +05:30
Nabin Hait
b48fd9dfa9
Merge pull request #2965 from neilLasrado/serial-no
...
fixes in get_serial_number function
2015-03-18 14:26:14 +05:30
Nabin Hait
5a2be606ef
Merge pull request #2967 from neilLasrado/price-list
...
fix - price list none is disabled error
2015-03-18 14:25:53 +05:30
Neil Trini Lasrado
adb1b2ccef
fix - price list none is disabled error if price list is made blank in purchase order
2015-03-18 11:41:58 +05:30
Neil Trini Lasrado
3d61bbb36a
fixes in get_serial_number function
2015-03-18 11:04:32 +05:30
Anand Doshi
3353ad42bc
setup wizard bounce animation when working
2015-03-17 12:45:44 +05:30
Pratik Vyas
52c5121ecd
change version to v5.0.0-beta
2015-03-17 11:22:16 +05:30
Pratik Vyas
768b018561
Merge remote-tracking branch 'upstream/v5.0' into develop
2015-03-17 11:21:20 +05:30
Nabin Hait
a1bf43b1a6
Merged develop into v5
2015-03-17 10:50:47 +05:30
Nabin Hait
d3fd8965de
test case fixed
2015-03-17 10:15:19 +05:30
Pratik Vyas
7b4b31fdf7
Merge branch 'develop'
2015-03-16 21:38:30 +05:30
Pratik Vyas
ec25117ab0
bumped to version 4.24.1
2015-03-16 22:08:30 +06:00
Nabin Hait
dfa013e73f
Merge pull request #2962 from nabinhait/develop
...
manipulate_grand_total_for_inclusive_tax
2015-03-16 17:54:54 +05:30
Anand Doshi
5b73da99d6
[minor] fixed patch
2015-03-16 17:10:28 +05:30
Nabin Hait
f2791f8898
manipulate_grand_total_for_inclusive_tax
2015-03-16 17:01:09 +05:30
Nabin Hait
66773229a4
Merge pull request #2958 from anandpdoshi/anand-mar-13
...
manipulate grand total for inclusive tax
2015-03-16 15:58:23 +05:30
Anand Doshi
ead48094b6
manipulate diff only if diff <= 0.02
2015-03-13 18:59:01 +05:30
Anand Doshi
d6822ddd7c
manipulate grand total for inclusive tax
2015-03-13 18:23:10 +05:30
Anand Doshi
9d9e31f4e8
moved get_list_context to module
2015-03-13 12:48:05 +05:30
Pratik Vyas
2e5be6f994
Merge pull request #2955 from neilLasrado/v5.0
...
patch rename
2015-03-13 11:46:14 +05:30
Neil Trini Lasrado
14543169b4
patch rename
2015-03-13 11:43:52 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Nabin Hait
c8c1d1c693
Test case fixes
2015-03-13 08:14:45 +05:30
Nabin Hait
15e4833785
Merge pull request #2943 from neilLasrado/time-log
...
bug fix - show time log in production order operations
2015-03-12 17:53:16 +05:30
Nabin Hait
53ea6fa686
Merge pull request #2944 from neilLasrado/po
...
fixes in Production Order
2015-03-12 17:52:59 +05:30
Nabin Hait
382d21fa3c
Merge pull request #2952 from neilLasrado/sales-person
...
validation added to check if multiple sales person have been given the s...
2015-03-12 17:52:40 +05:30
Neil Trini Lasrado
76d3a6c2ba
bug fix - show time log in production order operations
2015-03-12 17:51:50 +05:30
Neil Trini Lasrado
6f272f2f53
fixes in Production Order
2015-03-12 17:51:06 +05:30
Neil Trini Lasrado
c6dfb02e4a
mend
2015-03-12 16:15:36 +05:30
Neil Trini Lasrado
e7044fa0f6
validation added to check if multiple sales person have been given the same employee id
2015-03-12 16:15:03 +05:30
Nabin Hait
1ca0b74e03
Merge pull request #2945 from neilLasrado/workstation
...
warehouse removed from workstation master
2015-03-12 16:13:47 +05:30
Nabin Hait
9ac71c0b17
Merge pull request #2935 from neilLasrado/po-fix
...
Bug fixes in Production Order
2015-03-12 16:07:21 +05:30
Sambhaji Kolate
feff40a930
update get_batch_no query to sort batch with expiry date
...
small fix to avoid error msg if item_code not selected and batch_no is entered
2015-03-11 11:50:28 +05:30
Nabin Hait
4944fb33ce
Merge pull request #2942 from sbktechnology/develop
...
Added Actual Batch Qty for item in DN & SI
2015-03-11 10:22:47 +05:30
Anand Doshi
838ba02d34
setup wizard image fix
2015-03-10 19:15:49 +05:30
Sambhaji Kolate
845f1c636e
code cleanup
2015-03-10 15:19:29 +05:30
Neil Trini Lasrado
2c25a4396f
warehouse removed from workstation master
2015-03-10 15:15:54 +05:30
Sambhaji Kolate
98dbccd1d6
added actual_batch_qty at warehouse in DN & SI #1873
2015-03-10 15:04:28 +05:30
Pratik Vyas
7346ff3d08
Merge branch 'develop'
2015-03-10 10:41:35 +05:30
Pratik Vyas
21761c204c
bumped to version 4.24.0
2015-03-10 11:11:35 +06:00
Nabin Hait
87f3ba139e
Merge pull request #2936 from nabinhait/develop
...
Repost reserved qty and sle for sales invoice without warehouse
2015-03-09 18:50:46 +05:30
Nabin Hait
11498cac94
Repost sle for si without warehouse
2015-03-09 18:28:35 +05:30
Nabin Hait
7a31f6aaca
repost reserved qty if negative
2015-03-09 16:31:11 +05:30
Rushabh Mehta
f5f0d5a83a
[breadcrumbs] refactor
2015-03-09 15:48:16 +05:30
Anand Doshi
ecd2e0f386
Setup Wizard: catch duplicate entry error
2015-03-09 15:42:52 +05:30
Neil Trini Lasrado
42556dfab9
fixes-in-production-order
2015-03-09 15:35:24 +05:30
Nabin Hait
7d5a2390dd
Merge pull request #2934 from nabinhait/develop
...
Pricing Rule Issue
2015-03-09 15:31:37 +05:30
Nabin Hait
081c3ec476
c-form message issue
2015-03-09 15:11:34 +05:30
Nabin Hait
e2f054cc27
transaction date issue in pricing rule fixed
2015-03-09 14:54:37 +05:30
Pratik Vyas
6fbb25bf9d
update translations
2015-03-08 21:29:59 +05:30
Anand Doshi
c0eb8c0de3
Fixed some Stock Entry test cases
2015-03-08 12:42:18 +05:30
Anand Doshi
1119fb4c00
Fixed Sales Invoice test cases
2015-03-06 20:50:51 +05:30
Anand Doshi
e514323be4
load all js and css like before in desk.html
2015-03-06 13:17:26 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Rushabh Mehta
06a6bcce17
[fixes] pos, chart of accounts
2015-03-05 16:38:43 +05:30
Rushabh Mehta
c4dce99f4b
[fixes] pos #2830 , #2795
2015-03-05 15:09:04 +05:30
Rushabh Mehta
b888359b45
Merge pull request #2886 from neilLasrado/bom_test_records
...
text records fixed in bom
2015-03-05 10:57:33 +05:30
Nabin Hait
b50833a1e8
Fields alignment
2015-03-04 16:14:02 +05:30
Nabin Hait
95ff2d4fed
discount loss adjustment in base currency
2015-03-04 16:02:21 +05:30
Rushabh Mehta
31724da2d6
[print] item qty & uom on same line
2015-03-04 15:51:08 +05:30
Nabin Hait
25bd84dfcc
Discount amount loss adjustment if no taxes or discount applied on net total
2015-03-04 15:07:17 +05:30
Rushabh Mehta
0c677aa151
fix #2847
2015-03-04 12:32:59 +05:30
Nabin Hait
652c7db6e8
Stock entry fixes: incoming rate, toggle display of bom related fields
2015-03-03 18:33:34 +05:30
Nabin Hait
57a5c71663
Update rate in exploded_items on click of update cost btton
2015-03-03 18:27:21 +05:30
Rushabh Mehta
2cc585f180
[git fixes] salary manager, time log title, notificaitons
2015-03-03 16:06:54 +05:30
Rushabh Mehta
e693f794f5
[subcontract] refactor, make stock entry from PO
2015-03-03 15:50:24 +05:30
Nabin Hait
49ecbd7353
Sales invoice query in journal entry
2015-03-03 15:48:33 +05:30
Nabin Hait
56c6a65a22
argument name fix in sendmail
2015-03-03 15:48:33 +05:30
Nabin Hait
fcda00f317
Activity spelling correction
2015-03-03 15:48:33 +05:30
Nabin Hait
81b8d7597d
bom with operations activity
2015-03-03 15:48:33 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
43ba7e1a30
allow negative stock issie fixed
2015-03-03 14:07:21 +05:30
Nabin Hait
786472279a
salary slip calculation: trigger on
2015-03-03 14:07:21 +05:30
Nabin Hait
c7aba3331b
verified chart of accounts
2015-03-03 14:07:21 +05:30
Rushabh Mehta
1758357a0a
[item] toggle reqd, fixes #2832
2015-03-03 11:08:22 +05:30
Pratik Vyas
593d56265f
update translations
2015-03-02 19:11:14 +05:30
Rushabh Mehta
c37281e59c
Merge pull request #2897 from neilLasrado/job-application
...
job application fixed
2015-03-02 19:01:16 +05:30
Neil Trini Lasrado
96bc31db27
job application fixed
2015-03-02 18:54:45 +05:30
Rushabh Mehta
910ba02f49
Merge pull request #2896 from neilLasrado/employee-report
...
employee information report fix
2015-03-02 18:31:47 +05:30
Rushabh Mehta
9bb42359d8
Merge pull request #2895 from neilLasrado/appraisal
...
Fixes in Appraisal doc
2015-03-02 18:30:52 +05:30
Rushabh Mehta
c33a81c536
[production order] from_bom issue fixes #2879
2015-03-02 18:27:03 +05:30
Rushabh Mehta
b83fa3bc2d
[pos] [barcode] fixes #2831
2015-03-02 18:25:14 +05:30
Neil Trini Lasrado
71a651ec21
employee information report fix
2015-03-02 18:13:25 +05:30
Neil Trini Lasrado
fd0920fe83
Fixes in Appraisal doc
2015-03-02 17:33:48 +05:30
Rushabh Mehta
8c84fca182
[fix] #2875
2015-03-02 16:29:56 +05:30
Rushabh Mehta
3384cb7e63
[fix] #2836
2015-03-02 16:20:23 +05:30
Rushabh Mehta
00e3b26597
[fix] rename tool #2861
2015-03-02 15:05:36 +05:30
Rushabh Mehta
905f8328ab
cleanup global defaults, fix #2838 :
2015-03-02 13:01:39 +05:30
Neil Trini Lasrado
5cbd12e4e5
text records fixed in bom
2015-03-02 10:53:12 +05:30
Anand Doshi
16018dd474
removed erpnext splash
2015-03-01 21:16:44 +05:30
Nabin Hait
86cd4cc739
discount related fix
2015-02-28 19:12:55 +05:30
Nabin Hait
bc6c360bf1
Update accounts_controller.py
2015-02-27 23:40:56 +05:30
Nabin Hait
ad7ece63fe
Update sales_invoice.py
2015-02-27 22:45:28 +05:30
Nabin Hait
b7ae9b4283
Merge pull request #2866 from neilLasrado/barcode
...
Barcode added to stock entry
2015-02-27 11:35:07 +05:30
Anand Doshi
8f9e631a44
minor fixes
2015-02-26 20:29:43 +05:30
Pratik Vyas
7e98eb3ab7
Merge branch 'develop'
2015-02-26 14:46:43 +05:30
Pratik Vyas
8462f4ad2c
bumped to version 4.23.0
2015-02-26 15:16:43 +06:00
Pratik Vyas
add4c96280
Merge pull request #2871 from anandpdoshi/anand-feb-26
...
Fixes in queries and translations
2015-02-26 14:43:27 +05:30
Anand Doshi
45b5da0826
[translations] removed translations that have missing placeholders like {0}
2015-02-26 13:34:24 +05:30
Pratik Vyas
dc24d0151c
Merge branch 'develop'
2015-02-26 13:27:41 +05:30
Pratik Vyas
c452b4b7cc
bumped to version 4.22.2
2015-02-26 13:57:41 +06:00
Anand Doshi
335763da49
updated translations
2015-02-26 13:20:15 +05:30
Anand Doshi
5bd8cfd9fe
[fix] queries
2015-02-26 12:40:58 +05:30
Nabin Hait
851c745fdf
Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0
2015-02-26 12:32:04 +05:30
Nabin Hait
8be6939288
help description for party account
2015-02-26 12:31:07 +05:30
Nabin Hait
2ed025e62d
Merge pull request #2870 from nabinhait/fix1
...
Fixes
2015-02-26 11:41:10 +05:30
Nabin Hait
836f9f34e4
warehouse mandatory in sales invoice if update_stock
2015-02-26 11:40:20 +05:30
Nabin Hait
98a8fae7c2
hotfix for fetching default account and warehouse
2015-02-26 11:37:07 +05:30
Neil Trini Lasrado
4374692cf5
fixes
2015-02-25 19:01:17 +05:30
Neil Trini Lasrado
4abda67a98
Barcode added to stock entry
2015-02-25 19:01:17 +05:30
Anand Doshi
e474aa5d91
[minor] Product grid text-ellipsis
2015-02-25 18:52:22 +05:30
Nabin Hait
69d874e7d7
Merge pull request #2864 from neilLasrado/delivery-note
...
Delivery note - Batch Id made Link Feild
2015-02-25 18:37:17 +05:30
Nabin Hait
690f8b9323
Merge pull request #2868 from nabinhait/fix1
...
fix in financial statements
2015-02-25 18:35:09 +05:30
Nabin Hait
79ffc2b3a7
fix in financial statements
2015-02-25 18:32:25 +05:30
Rushabh Mehta
a8a2fb225d
[fixes] item, test site install
2015-02-25 17:32:22 +05:30
Rushabh Mehta
66a92792b4
[fix] default account for manufacturing stock entry should be cogs
2015-02-25 17:15:45 +05:30
Rushabh Mehta
8f62e2448c
[fix] patches
2015-02-25 16:28:33 +05:30
Rushabh Mehta
6cdfd1e976
[fix] patches
2015-02-25 15:55:57 +05:30
Rushabh Mehta
2a21bc9fc2
[taxes and charges] refactor
2015-02-25 15:08:57 +05:30
Rushabh Mehta
e91388381c
[minor] notifications and other fixes to stock
2015-02-25 15:08:57 +05:30
Anand Doshi
d75ef108fc
Allow user to change page_name in Item and Item Group #2397
2015-02-25 13:50:14 +05:30
Neil Trini Lasrado
b9ff7186ed
batch field changed to link feild in packed_item
2015-02-25 12:44:45 +05:30
Anand Doshi
28d21ba3c0
[minor] fix build.json
2015-02-24 22:28:26 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Anand Doshi
da858cc587
Website Product Image
2015-02-24 17:52:09 +05:30
Nabin Hait
93b3a37a3b
rounding issue and rate trigger
2015-02-24 17:08:51 +05:30
Rushabh Mehta
b620fed762
[fixes] [minor]
2015-02-24 16:51:22 +05:30
Nabin Hait
7ce2f55ca9
print_hide for total_taxes_and_charges in buying
2015-02-24 16:06:14 +05:30
Nabin Hait
72c359afa2
valuation type charges can not be inclusive
2015-02-24 16:05:19 +05:30
Nabin Hait
903c42a130
multiplefixes
2015-02-24 15:24:49 +05:30
Rushabh Mehta
99d0941008
[time logs] fixes
2015-02-24 14:48:11 +05:30
Nabin Hait
9524ee7ec6
tax amount in print
2015-02-24 14:43:14 +05:30
Anand Doshi
13b3b070e3
Merge pull request #2843 from anandpdoshi/anand-feb-24
...
[fix] Added unicode_literals if missing in py files
2015-02-24 14:16:05 +05:30
Nabin Hait
d5616cd977
reload journal entry on patch
2015-02-24 13:12:13 +05:30
Nabin Hait
b923f8a78b
project milestone patch fix
2015-02-24 13:05:49 +05:30
Nabin Hait
20256fa716
Merge pull request #2842 from nabinhait/foreign_currency_calc
...
Foreign currency calc
2015-02-24 12:56:57 +05:30
Anand Doshi
2878cc7757
[fix] get bom items query
2015-02-24 12:39:42 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
7b19b9ed02
minor fixes
2015-02-24 10:04:00 +05:30
Nabin Hait
6dfbc2465b
Patch: taxes and totals in party currency
2015-02-24 10:04:00 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8
Fields added in all sales and purchase doctypes
2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60
Validate taxes and charges input, commonified
2015-02-24 10:02:28 +05:30
Nabin Hait
34afcfb4a1
Print without amount in delivery note
2015-02-24 10:02:27 +05:30
Nabin Hait
e9eec93be7
minor fix
2015-02-24 10:02:27 +05:30
Nabin Hait
f0bc9b6d3a
Renamed Net total to Total and dynamic label
2015-02-24 10:02:27 +05:30
Nabin Hait
755ff60313
tax amount conversion in client side printing
2015-02-24 10:02:27 +05:30
Nabin Hait
de9c8a9028
discount calculation and in print view
2015-02-24 10:02:27 +05:30
Nabin Hait
2b019ed430
Fixes for discount amount
2015-02-24 10:02:27 +05:30
Nabin Hait
ce24512ed7
Commonified sales/purchase taxes and charges master.js code
2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf
Taxes and totals calculation in party currency
2015-02-24 10:02:27 +05:30
Pratik Vyas
81d96fdb60
Merge pull request #2839 from pdvyas/v5-lang
...
update translations and patch to new format
2015-02-23 23:51:29 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +05:30
Rushabh Mehta
a1da88a3d3
[capacity planning] automatically plan Time Logs from Production Order
2015-02-23 20:18:38 +05:30
Rushabh Mehta
93b2f167f8
[fixes] opportunity, task minor
2015-02-23 14:43:16 +05:30
Rushabh Mehta
281dc5d639
[patch] added item patch
2015-02-23 14:43:15 +05:30
Rushabh Mehta
d06c1188a0
[item] patches
2015-02-23 14:43:15 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
65a2759432
[minor] opportunity / item
2015-02-21 17:35:50 +05:30
Rushabh Mehta
7bbbda162c
[warranty claim] ux - serial no on top
2015-02-21 14:49:17 +05:30
Rushabh Mehta
364054a6fc
[fix] payment tool #2791
2015-02-21 14:39:35 +05:30
Rushabh Mehta
e8a37949cf
[issue fixes] + added fixtures for item attribute and operation
2015-02-20 20:10:11 +05:30
Rushabh Mehta
e9b3092167
Merge pull request #2805 from frappe/pdvyas-patch-1
...
Update transaction_base.py
2015-02-20 16:23:36 +05:30
Pratik Vyas
7f9489e814
Update transaction_base.py
2015-02-20 16:22:24 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
bcccfa09f2
[patch] [fix]
2015-02-20 15:28:50 +05:30
Pratik Vyas
62ab126ca9
update translations and patch to new format
2015-02-20 15:20:37 +05:30
Rushabh Mehta
dc93e0adc6
[fixes] stock reco
2015-02-20 15:11:56 +05:30
Nabin Hait
4d32afde30
Merge pull request #2804 from nabinhait/fix1
...
update stock uom in sle for DN
2015-02-20 14:24:52 +05:30
Nabin Hait
ad3fd5166b
update stock uo in sle for DN
2015-02-20 14:23:58 +05:30
Nabin Hait
010657145d
Merge pull request #2803 from sbktechnology/develop
...
fixed stock_balance report for stock_uom #2802
2015-02-20 14:14:14 +05:30
Sambhaji Kolate
973f78e7d3
fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802
2015-02-20 13:09:39 +05:30
Rushabh Mehta
d51a47155b
[fixed] #2614
2015-02-20 10:39:39 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
c7a11cc451
[usability] [fixes] stock entry and production order
2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Nabin Hait
3fa7cc524b
Update sales_order_item.json
2015-02-18 21:11:45 +05:30
Nabin Hait
743f9664fc
Merge pull request #2785 from neilLasrado/kill-html-desc
...
patch fixes
2015-02-18 20:51:48 +05:30
Neil Trini Lasrado
ae3f4f363f
patch renamed
2015-02-18 20:48:26 +05:30
Neil Trini Lasrado
e9d45bcb28
patch fixes
2015-02-18 20:25:44 +05:30
Rushabh Mehta
8bb6e530c7
[fixes] accounts, stock changes
2015-02-18 20:22:59 +05:30
Rushabh Mehta
614e7ab757
[cleanup] SMS, and added item filter in stock balance
2015-02-18 19:51:48 +05:30
Rushabh Mehta
4ea1ade7b9
[hub] start
2015-02-18 19:09:56 +05:30
Nabin Hait
9252002249
Update taxes_and_totals.py
2015-02-18 18:48:30 +05:30
Nabin Hait
89c050e67d
removed print
2015-02-18 16:19:07 +05:30
Nabin Hait
8626d3881d
fixed renaming patch
2015-02-18 15:10:29 +05:30
Nabin Hait
06fd10620e
Merge pull request #2734 from neilLasrado/kill-html-desc
...
Kill html desc -WIP
2015-02-18 13:13:52 +05:30
Nabin Hait
5fd1727acd
Merge pull request #2752 from neilLasrado/stock-amount
...
client side - recalculate amount and total amount on change of qty or va...
2015-02-18 13:11:41 +05:30
Nabin Hait
9f89df341d
Merge pull request #2770 from neilLasrado/time-log
...
Validate renaming of activity type - manufacturing
2015-02-18 13:11:19 +05:30
Neil Trini Lasrado
e20057894e
Activity Type - permissions changed for users with system manager role
2015-02-18 13:06:12 +05:30
Neil Trini Lasrado
b091707ae8
Validate renaming of activity type - manufacturing
2015-02-18 13:00:56 +05:30
Neil Trini Lasrado
42e42b7647
fixes in patch
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
d98c4e007b
patch
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
d8b35639d8
image feild made hidden
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
7f70367dde
image view fixed for stock entry and bom
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
3361df709c
Image field and view added to all stock doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
6f51c2e4cc
Image field and view added to all buying doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
c48f06c095
Image field and view added to all selling doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
66df3566a9
html item desc removed from item master, item image added in oppurtunity
2015-02-18 12:32:37 +05:30
Nabin Hait
9f138b21fa
Merge branch 'foreign_currency_calc' into v5.0
2015-02-18 12:25:06 +05:30
Nabin Hait
7c28fc4014
Merge branch 'v5.0' of https://github.com/frappe/erpnext into v5.0
2015-02-18 12:24:49 +05:30
Nabin Hait
fe81da2dd1
listview indicator fix
2015-02-18 12:23:18 +05:30
Neil Trini Lasrado
b2c521847e
fixes
2015-02-18 12:07:09 +05:30
Nabin Hait
da5f766dd5
fixed conflict
2015-02-18 11:55:13 +05:30
Nabin Hait
b120520aa8
fixed patches
2015-02-18 11:54:08 +05:30
Neil Trini Lasrado
3efc6ab94d
fixes
2015-02-18 11:51:09 +05:30
Neil Trini Lasrado
9aafe76f63
client side - recalculate amount and total amount on change of qty or valuation reate of the item
2015-02-18 11:51:09 +05:30
Rushabh Mehta
2e0e711eb2
[minor] stock_ledger_entry.py
2015-02-18 11:38:48 +05:30
Nabin Hait
e55def23af
Merge pull request #2745 from neilLasrado/time-log
...
activity type fixes
2015-02-18 11:21:25 +05:30
Nabin Hait
d81e73e067
Merge pull request #2747 from neilLasrado/warehouse-filter
...
filters added to warehouses in prod order
2015-02-18 11:19:42 +05:30
Nabin Hait
1af9ac826c
Merge pull request #2763 from neilLasrado/production-planning-tool
...
fixes for capacity planning using production planning tool
2015-02-18 11:15:58 +05:30
Rushabh Mehta
df9e80c87a
[refactor] stock entry, minor ux
2015-02-17 19:56:04 +05:30
Rushabh Mehta
0fb678e7cf
[stock reco] cleanups
2015-02-17 19:56:04 +05:30
Anand Doshi
8c0f05fbae
[minor] grid report loading
2015-02-17 19:53:23 +05:30
Neil Trini Lasrado
7182d349df
fixes for capacity planning using production planning tool
2015-02-17 16:19:41 +05:30
Neil Trini Lasrado
744aec8def
activity type fixs
2015-02-17 16:12:32 +05:30
Neil Trini Lasrado
b13c4e2516
filters added to warehouses in prod order
2015-02-17 16:07:37 +05:30
Pratik Vyas
5aa465ae44
Merge branch 'develop'
2015-02-17 16:02:58 +05:30
Pratik Vyas
28777bf693
bumped to version 4.22.1
2015-02-17 16:32:58 +06:00
Anand Doshi
a6c361c00e
Setup Wizard: Load number format based on currency #2627 , login as first user on setup complete
2015-02-17 15:56:31 +05:30
Anand Doshi
0fe854692d
[fix] add CRM module to user desktop items in patch
2015-02-17 14:45:36 +05:30
Nabin Hait
7945195478
Merge pull request #2761 from neilLasrado/update-finished-goods-fix
...
Update finished goods fix
2015-02-17 14:21:41 +05:30
Nabin Hait
8dd0e9db15
Merge pull request #2759 from neilLasrado/prod-workstation
...
workstation and operation time made editable in production order.
2015-02-17 14:21:24 +05:30
Nabin Hait
13e6ac737f
Merge pull request #2748 from neilLasrado/get-prod-order
...
fixes in stock entry
2015-02-17 14:12:00 +05:30
Nabin Hait
44454cb81b
Merge pull request #2744 from neilLasrado/operation-time
...
operation time made mandatory in bom operations
2015-02-17 14:08:55 +05:30
Nabin Hait
133b7ed218
Merge pull request #2743 from neilLasrado/price-list
...
Price list name made - 'no copy'
2015-02-17 14:08:18 +05:30
Nabin Hait
cdb8e374e3
Merge pull request #2727 from neilLasrado/voucher-type
...
journal entry - accounts table cannot be blank - validation added
2015-02-17 14:07:44 +05:30
Nabin Hait
2fbafab4b2
Merge pull request #2764 from nabinhait/fix1
...
Fetch default accounts, cost center only if company matches with the tra...
2015-02-17 14:07:14 +05:30
Nabin Hait
7d845502a0
Merge branch 'foreign_currency_calc' into v5.0
2015-02-17 12:51:54 +05:30
Nabin Hait
bd00e81ad5
Commonified taxes and totals calculation in server side
2015-02-17 12:50:51 +05:30
Rushabh Mehta
2712e36f08
[stock reco] added items table
2015-02-17 12:50:20 +05:30
Rushabh Mehta
06072c1e51
[refactor] Material Transfer for Manufacture
2015-02-17 11:50:45 +05:30
Nabin Hait
6f0a3ed8d4
fixed conflict
2015-02-17 11:12:04 +05:30
Nabin Hait
3237c75d98
Commonified taxes and totals calculation in server side
2015-02-17 11:11:11 +05:30
Rushabh Mehta
46e03eadca
[rename] Customer Issue -> Warranty Claim
2015-02-17 10:45:50 +05:30
Rushabh Mehta
60cfccbf77
[new-module] crm
2015-02-17 10:36:54 +05:30
Nabin Hait
b09ed41c52
Fetch default accounts, cost center only if company matches with the transactions
2015-02-17 10:34:17 +05:30
Rushabh Mehta
36b84408a8
[fixes] precision in purchase receipt and item group route
2015-02-16 18:26:38 +05:30
Neil Trini Lasrado
35898d7518
Update finished goods fix
2015-02-16 17:25:28 +05:30
Neil Trini Lasrado
f120aec9c2
workstation and operation time made editable in production order. Cost recalculation logic added
2015-02-16 15:10:29 +05:30
Pratik Vyas
cdba583a25
Merge branch 'develop'
2015-02-16 12:20:19 +05:30
Pratik Vyas
2d916436c5
bumped to version 4.22.0
2015-02-16 12:50:19 +06:00
Pratik Vyas
7ee9e9d06b
Merge pull request #2758 from pdvyas/lang
...
Update translations
2015-02-16 10:41:40 +05:30
Pratik Vyas
b72abbc402
Update translations
2015-02-14 21:08:37 +05:30
Rushabh Mehta
7a64cb2aa5
[bom] [fix] company link
2015-02-13 16:11:25 +05:30
Neil Trini Lasrado
4d4c643b7e
fixes in stock entry
2015-02-13 13:09:17 +05:30
Rushabh Mehta
6efbc9dacd
[event] share with user
2015-02-13 10:17:13 +05:30
Anand Doshi
c82331bc19
[design] Setup Wizard
2015-02-12 20:02:17 +05:30
Nabin Hait
188f69a713
commonified totals calculation in js
2015-02-12 17:55:50 +05:30
Neil Trini Lasrado
06f712dcd7
operation time made mandatory in bom operations
2015-02-12 17:52:46 +05:30
Neil Trini Lasrado
62885b3c56
Price list name made -no copy
2015-02-12 17:41:20 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
dd1c2d3018
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-12 13:31:48 +05:30
Nabin Hait
4a149c0791
Chart of accounts cleanup for Nicaragua
2015-02-12 12:39:32 +05:30
Nabin Hait
031303d719
Replace renamed fields in custom script and custom print formats
2015-02-12 11:48:50 +05:30
Nabin Hait
56e6ad2112
Patch for renamed total fields
2015-02-12 11:48:20 +05:30
Nabin Hait
461ee2ebae
Renamed total fields
2015-02-12 11:47:45 +05:30
Nabin Hait
0c0749a884
Merge pull request #2721 from williamjmorenor/v5.0
...
Add chart of accounts template for Nicaragua
2015-02-12 11:46:43 +05:30
William Moreno
5b72e21186
Final Fixing
...
I will no make other changes, please can chech the JSON
2015-02-11 16:57:43 -06:00
William Moreno
a05e6df3f5
Minor Fix
2015-02-11 15:48:41 -06:00
William Moreno
dab1db9874
Minor Fix
2015-02-11 15:43:40 -06:00
William Moreno
8e5e414276
Minor fix
2015-02-11 15:38:27 -06:00
William Moreno
92774e4743
Minor fix
2015-02-11 15:36:14 -06:00
William Moreno
c3d79305f6
Merge pull request #1 from williamjmorenor/ni_ni_chart_of_account
...
ni_ni_chart_template.json
* Fix missing Comma (,)
* Change Style => TITLE to Title
* Rearrange accounts to improve readability
* Best IFRS for SMES compatibility
* Best accounts tax details
* Validate JSON
* Add root_type and account_type
2015-02-11 15:11:37 -06:00
William Moreno
c2037c5444
Add root_type and account_type
2015-02-11 15:06:58 -06:00
William Moreno
0a582ec885
Validate JSON
2015-02-11 12:41:11 -06:00
William Moreno
df023bd8ad
Best accounts tax details
2015-02-11 12:38:51 -06:00
William Moreno
f2bf17f2e2
Best IFRS for SMES compatibility
2015-02-11 12:06:40 -06:00
William Moreno
43d39f8e4d
Best IFRS for SMES compatibility
2015-02-11 11:57:22 -06:00
William Moreno
6b34bca7d0
Best IFRS for SMES compatibility
2015-02-11 11:53:45 -06:00
William Moreno
6fd091d979
Rearrange accounts to improve readability
2015-02-11 09:36:03 -06:00
William Moreno
7d7113328d
Change Style => TITLE to Title
2015-02-11 09:22:55 -06:00
William Moreno
1caea2ebae
Fix missing Comma (,)
...
Yes, I did not validate the last edit to the JSON before commit, sorry
2015-02-11 07:39:23 -06:00
Neil Trini Lasrado
802d717a9e
fixes
2015-02-11 17:27:58 +05:30
Neil Trini Lasrado
934d63de16
journal entry - accounts table cannot be blank - validation added
2015-02-11 17:05:41 +05:30
Nabin Hait
ceb04726c8
Merge pull request #2725 from neilLasrado/workstation-operation-hours
...
Workstation Doc Fixed
2015-02-11 16:52:26 +05:30
Nabin Hait
27a1f20135
Merge pull request #2724 from neilLasrado/planned-start-date
...
validations added to production order
2015-02-11 16:51:39 +05:30
Nabin Hait
ff23936584
Merge pull request #2728 from neilLasrado/patch-fixed
...
landed cost voucher fix
2015-02-11 16:51:02 +05:30
Neil Trini Lasrado
daaf5814fa
landed cost voucher fix
2015-02-11 16:23:46 +05:30
Pratik Vyas
ce7b238e88
Merge pull request #2726 from pdvyas/lang
...
Add Bosnian and Catalin language
2015-02-11 15:36:54 +05:30
Pratik Vyas
f082b3d8a1
add Bosnian and Catalin language
2015-02-11 15:12:56 +05:30
Neil Trini Lasrado
8521558f40
Workstation Doc Fixed
2015-02-11 14:58:43 +05:30
Neil Trini Lasrado
87402df56a
validations added to production order
2015-02-11 14:35:52 +05:30
Pratik Vyas
eda4265dbc
Merge branch 'develop'
2015-02-11 13:07:59 +05:30
Pratik Vyas
a9eae0b424
bumped to version 4.21.4
2015-02-11 13:37:59 +06:00
Nabin Hait
7945712171
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-11 12:55:10 +05:30
Nabin Hait
c3fc490d53
Merge pull request #2722 from nabinhait/fix1
...
minor fix in authorization rule
2015-02-11 12:25:16 +05:30
Nabin Hait
108e935744
minor fix in authorization rule
2015-02-11 12:24:45 +05:30
William Moreno
ad45007362
Add chart of accounts template for Nicaragua
...
On branch v5.0
new file: erpnext/accounts/doctype/account/chart_of_accounts/ni_ni_chart_template.json
2015-02-10 23:57:24 -06:00
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Pratik Vyas
eac82039e3
Merge branch 'develop'
2015-02-09 18:34:23 +05:30
Pratik Vyas
e0a8f2d859
bumped to version 4.21.3
2015-02-09 19:04:23 +06:00
Nabin Hait
fcca772383
Merge pull request #2712 from nabinhait/fix1
...
UOM validation for BOM Items
2015-02-09 17:02:41 +05:30
Nabin Hait
c5fb88c1cd
UOM validation for BOM Items
2015-02-09 16:48:02 +05:30
Pratik Vyas
aacb0a702e
Add auto email id in test site_config.json
2015-02-06 16:55:41 +05:30
Pratik Vyas
f3a9d788bf
Merge branch 'develop'
2015-02-06 16:32:00 +05:30
Pratik Vyas
6203cf7f04
bumped to version 4.21.2
2015-02-06 17:02:00 +06:00
Nabin Hait
2813f38c5a
Merge pull request #2695 from neilLasrado/bom-item-desc
...
Update BOM Item Description
2015-02-06 16:20:05 +05:30
Neil Trini Lasrado
845be908d6
function moved to validate
2015-02-06 16:15:45 +05:30
Neil Trini Lasrado
8fd3828ef5
Update Item Desc Button Removed from BOM, Item desc automatically updated in BOM on save of item master
2015-02-06 16:09:55 +05:30
Nabin Hait
4e95d67477
Merge pull request #2679 from neilLasrado/time-log-fix
...
Time log fix
2015-02-06 16:09:36 +05:30
Neil Trini Lasrado
11cd4f6c30
time log activity type made mandatory, new activity type manufacturing created
2015-02-06 16:06:45 +05:30
Neil Trini Lasrado
07a0d250ed
time log fixes
2015-02-06 16:06:14 +05:30
Neil Trini Lasrado
b744e16a83
Activity made compulsory for time_log_type Project
2015-02-06 16:05:34 +05:30
Neil Trini Lasrado
93638bd179
Time Log -
...
Project made compulsory for time logs with time_log_for selected as 'Project'
Activity Type Madetory criteria removed
Compleated Quantity hidden if time_log_for is not set as Manufacturing
2015-02-06 16:05:34 +05:30
Nabin Hait
e7cf961eaa
Merge pull request #2690 from neilLasrado/opportunity-status
...
fixes for #2655
2015-02-06 16:04:42 +05:30
Nabin Hait
4ed51416e5
Merge pull request #2656 from neilLasrado/po-capacity-planning
...
fixes for production order
2015-02-06 16:04:08 +05:30
Neil Trini Lasrado
47a62c623c
fixes for #2655
2015-02-06 15:51:20 +05:30
Nabin Hait
4ec5d5594b
Merge pull request #2696 from nabinhait/fix1
...
net_total and grand_total mismatch issue
2015-02-06 15:43:10 +05:30
Nabin Hait
a3cb828ed3
progress bar in item grid
2015-02-06 13:00:33 +05:30
Anand Doshi
e241569303
Allow non-english characters in Naming Series
2015-02-06 12:56:26 +05:30
Anand Doshi
9b30a8626c
[minor] removed default filters for sales order and material request, fixed pos css
2015-02-06 12:30:08 +05:30
Nabin Hait
5e13e0c316
net_total and grand_total mismatch issue
2015-02-05 17:18:03 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Pratik Vyas
bfeb7c4a57
Merge branch 'develop'
2015-02-05 15:44:06 +05:30
Pratik Vyas
43f627a83a
bumped to version 4.21.1
2015-02-05 16:14:06 +06:00
Anand Doshi
d0b3a3734e
Merge pull request #2693 from anandpdoshi/anand-feb-5
...
Fixed call to calculate
2015-02-05 15:25:25 +05:30
Nabin Hait
94365fa035
Merge pull request #2694 from nabinhait/fix1
...
divisional loss adjustment while doing gl entry for purchase receipt
2015-02-05 15:22:28 +05:30
Nabin Hait
e0ce9407cb
divisional loss adjustment while doing gl entry for purchase receipt
2015-02-05 15:12:37 +05:30
Anand Doshi
dea3fb0d64
[fix] call calculate code only once after applying pricing rule
2015-02-05 15:06:16 +05:30
Pratik Vyas
1dae1c40b9
Merge branch 'develop'
2015-02-05 14:25:13 +05:30
Pratik Vyas
fd654a06e8
bumped to version 4.21.0
2015-02-05 14:55:13 +06:00
Nabin Hait
5bf1f89da7
Merge pull request #2669 from nathando/patch-2
...
Look like a minor bug
2015-02-05 13:48:47 +05:30
Nabin Hait
b6c8c7436f
Merge pull request #2691 from nabinhait/fix1
...
item-wise tax distribution if amount entered in actual
2015-02-05 10:31:30 +05:30
Anand Doshi
dd942bb3d2
[minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists
2015-02-04 18:53:24 +05:30
Nabin Hait
1dc8ff5220
item-wise tax distribution if amount entered in actual
2015-02-04 18:06:59 +05:30
Rushabh Mehta
0e13221338
[print] item tables - override description and uom
2015-02-04 17:02:24 +05:30
Neil Trini Lasrado
59a706585c
actual start and end date made blank if islocal
2015-02-04 11:44:24 +05:30
Neil Trini Lasrado
de164c91e0
actual start and end date calculation - call moved to submit and cancel of Time Log
2015-02-04 11:35:10 +05:30
Neil Trini Lasrado
2017796de7
fixes in auto create time logs
2015-02-04 11:16:49 +05:30
Neil Trini Lasrado
a9b3ec180e
fixes for productiojn order
2015-02-04 11:16:49 +05:30
Rushabh Mehta
b736443e3f
[patch] [fix]
2015-02-04 10:40:02 +05:30
Nabin Hait
279bb6f3ed
Merge pull request #2628 from neilLasrado/batch-validation
...
Batch Validation
2015-02-03 18:33:49 +05:30
Nabin Hait
06d81822fd
Merge pull request #2673 from nabinhait/fix1
...
Multiple fixes
2015-02-03 18:32:19 +05:30
Nabin Hait
1f9c6fdcf3
Merge pull request #2605 from neilLasrado/bom-costs
...
Bom operations and item link removed.
2015-02-03 18:31:56 +05:30
Neil Trini Lasrado
14e24a947b
fixes for batch validations
2015-02-03 18:23:46 +05:30
Neil Trini Lasrado
9448aaf2a6
validation added in stock entry
2015-02-03 18:09:56 +05:30
Neil Trini Lasrado
acbf185c1e
fixes
2015-02-03 18:07:34 +05:30
Neil Trini Lasrado
c8c67f7807
Bom operations and item link removed. Cost recalculated on removal of operation or rew material row.
2015-02-03 18:07:34 +05:30
Nabin Hait
44c0a741d1
Merge pull request #2672 from neilLasrado/batch-list-view
...
batch list view fix
2015-02-03 18:01:53 +05:30
Nabin Hait
c0c9023d27
Merge pull request #2653 from neilLasrado/bom-validations
...
Validations added to Bom Doctype.
2015-02-03 18:01:31 +05:30
Nabin Hait
bdc72e7e8b
Merge pull request #2613 from neilLasrado/bom-item-name
...
item name added to BOM
2015-02-03 18:01:10 +05:30
Nabin Hait
0c883500bb
Expense account query in purchase invoice
2015-02-03 17:59:00 +05:30
Nabin Hait
4ce020f521
Item grid header in print format
2015-02-03 17:59:00 +05:30
Rushabh Mehta
c567e8e960
[fix] analytics reports + remove print item tables #2667
2015-02-03 17:56:25 +05:30
Neil Trini Lasrado
75e0f0a153
batch list view fix:
2015-02-03 17:41:11 +05:30
Nabin Hait
11cb9de10a
Merge pull request #2670 from nabinhait/fix1
...
default target warehouse for subcontract
2015-02-03 14:34:34 +05:30
Neil Trini Lasrado
9257baa747
fixes in bom validations
2015-02-03 12:29:36 +05:30
Neil Trini Lasrado
f5be350eb4
Validations added to Bom Doctype.
2015-02-03 12:21:46 +05:30
Neil Trini Lasrado
7dac750ffe
patch fix
2015-02-03 10:59:40 +05:30
Neil Trini Lasrado
41acbff959
item name added to BOM
2015-02-03 10:59:40 +05:30
Do Le Bao Nguyen
f9b63dd36a
Look like a minor bug
...
- There is no frappe.get_default but only frappe.db.get_default ?
- Error return if selecting Employee in Salary Slip without specifying the Fiscal Year first
2015-02-03 11:10:09 +08:00
Nabin Hait
282695f536
Merge pull request #2664 from neilLasrado/lead-search
...
lead report - state, country and pincode seprated from address
2015-02-02 17:07:00 +05:30
Nabin Hait
d2b762d760
Merge pull request #2617 from neilLasrado/sales-order
...
sales order - allow same item to enter multiple times. Throws warning
2015-02-02 16:44:12 +05:30
Nabin Hait
7e333c6a31
Merge pull request #2596 from neilLasrado/item-in-bom
...
allow bom field removed from Item Master
2015-02-02 16:33:46 +05:30
Nabin Hait
4b4598e5cb
Merge pull request #2594 from neilLasrado/bom-item-update
...
bom - button added to update item desc.
2015-02-02 16:30:58 +05:30
Neil Trini Lasrado
809abdf295
lead report - state, country and pincode seprated from address
2015-02-02 11:43:56 +05:30
Rushabh Mehta
052bd624c1
[minor] removed company description and don't call apply_price_list if no items
2015-01-30 16:57:24 +05:30
Anand Doshi
aff9a59f2d
[minor] removed pscript from Feature Setup, made Activity Type as mandator in Time Log
2015-01-29 19:49:34 +05:30
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Nabin Hait
79dc136d50
default target warehouse for subcontract
2015-01-29 12:51:17 +05:30
Pratik Vyas
2407d87b0d
Merge branch 'develop'
2015-01-28 17:01:56 +05:30
Pratik Vyas
276053b35f
bumped to version 4.20.2
2015-01-28 17:31:56 +06:00
Nabin Hait
dc4c2733f4
Merge pull request #2648 from nabinhait/fix1
...
Print format: show item table header as per meta label
2015-01-28 16:48:38 +05:30
Nabin Hait
f6f2fc4079
Print format: show item table header as per meta label
2015-01-28 16:45:13 +05:30
Nabin Hait
68b5eaa82f
Merge pull request #2646 from nabinhait/fix1
...
Minor fixes
2015-01-28 14:30:55 +05:30
Nabin Hait
238fd68803
Minor fix
2015-01-28 14:30:03 +05:30
Nabin Hait
22a4b82bd2
Minor fixes
2015-01-28 13:11:49 +05:30
Pratik Vyas
f456eb6254
Merge branch 'develop'
2015-01-27 14:43:53 +05:30
Pratik Vyas
408a8e804c
bumped to version 4.20.1
2015-01-27 15:13:53 +06:00
Anand Doshi
e0b39b860f
Merge pull request #2640 from anandpdoshi/anand-jan-27
...
Fixes to Error Reports
2015-01-27 14:33:12 +05:30
Anand Doshi
fde7febf0d
Merge pull request #2637 from neilLasrado/batch-patch
...
patch fix for Batch problem
2015-01-27 13:54:52 +05:30
Anand Doshi
eebf194468
Merge pull request #2638 from gitter-badger/gitter-badge-1
...
Add a Gitter chat badge to README.md
2015-01-27 13:31:05 +05:30
Anand Doshi
6f701b3b6a
[minor] Packing Slip get_query
2015-01-27 13:18:01 +05:30
Anand Doshi
8147f74e4e
[minor] Mandatory filters in Customer Acquisition and Loyalty
2015-01-27 13:16:18 +05:30
Neil Trini Lasrado
dc65dc3778
rename patch
2015-01-27 12:27:10 +05:30
The Gitter Badger
a7fb9216c9
Added Gitter badge
2015-01-27 06:12:58 +00:00
Neil Trini Lasrado
81b98261ae
patch fix
2015-01-27 11:28:56 +05:30
Nabin Hait
538253e503
removed test files for purchase taxes and charges master
2015-01-23 17:47:44 +05:30
Nabin Hait
ecce5141eb
replaced budget distribution
2015-01-23 16:32:35 +05:30
Nabin Hait
d41f3c1f5e
All the calculations in taxes_and_totals file
2015-01-23 16:24:49 +05:30
Pratik Vyas
c20072e940
Merge branch 'develop'
2015-01-23 16:16:53 +05:30
Pratik Vyas
e4c2ebfc57
bumped to version 4.20.0
2015-01-23 16:46:53 +06:00
Nabin Hait
587c061550
Merge pull request #2622 from neilLasrado/batch-patch
...
patch for is_batch_item
2015-01-23 15:45:53 +05:30
Neil Trini Lasrado
40a9f6f8e9
patch fix
2015-01-23 15:32:35 +05:30
Neil Trini Lasrado
f0b0464cce
patch for is_batch_item
2015-01-23 15:32:35 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Nabin Hait
4e803af0e6
Merge pull request #2625 from nabinhait/fix1
...
Allow nagative batch balance from landed cost voucher
2015-01-23 14:30:31 +05:30
Nabin Hait
4ccd8d3326
Allow nagative batch balance from landed cost voucher
2015-01-23 12:18:14 +05:30
Nabin Hait
b4a3dfa893
All the calculations in taxes_and_totals file
2015-01-22 17:13:13 +05:30
Nabin Hait
0c8bde5805
Merge branch 'v5.0' into foreign_currency_calc
2015-01-22 12:15:06 +05:30
Anand Doshi
88a1515b46
[minor] ERPNext as navbar-home
2015-01-21 18:25:04 +05:30
Nabin Hait
9768467d53
Merge pull request #2619 from nabinhait/fix1
...
POS fix: setting discount amount
2015-01-21 17:53:09 +05:30
Nabin Hait
59de1e23bc
POS fix: setting discount amount
2015-01-21 17:50:28 +05:30
Nabin Hait
963393409e
minor fix: child table length
2015-01-21 17:22:11 +05:30
Pratik Vyas
f19b1e0c6b
Merge branch 'develop'
2015-01-21 17:05:29 +05:30
Pratik Vyas
d33a3a295f
bumped to version 4.19.0
2015-01-21 17:35:29 +06:00
Nabin Hait
0a3e5653ba
bank reconciliation fix
2015-01-21 16:40:47 +05:30
Nabin Hait
f749302d25
Merge pull request #2616 from nabinhait/fix1
...
Fix1
2015-01-21 16:32:28 +05:30
Nabin Hait
9c47efb592
Landed cost voucher: allow negative stock while doing cancellation entry for purchase receipts
2015-01-21 16:22:45 +05:30
Neil Trini Lasrado
f108c2df72
sales order - allow same item to enter multiple times. Throws warning
2015-01-21 14:33:49 +05:30
Nabin Hait
ea61046e8d
Updated Quotation Status
2015-01-21 14:08:06 +05:30
Nabin Hait
3f671ea60f
Landed Cost Voucher: Add field and fixed reposting issue
2015-01-21 14:08:06 +05:30
Pratik Vyas
c1a7c3b08b
Update .travis.yml
2015-01-21 12:39:26 +05:30
Pratik Vyas
d1225661d2
Translation updates
2015-01-21 12:05:45 +05:30
Rushabh Mehta
71a6b93d89
[cleanups]
2015-01-19 17:35:05 +05:30
Rushabh Mehta
81e972eac4
[cleanups]
2015-01-19 17:34:54 +05:30
Neil Trini Lasrado
26b01f7852
fixes
2015-01-19 17:18:43 +05:30
Neil Trini Lasrado
f1f0a8ac19
bom - button added to update item desc.
2015-01-19 17:11:32 +05:30
Rushabh Mehta
302eee9406
Merge pull request #2463 from Steggur/develop
...
first is translation commit
2015-01-19 17:08:53 +05:30
Neil Trini Lasrado
c784fa219b
commit
2015-01-19 17:05:05 +05:30
Neil Trini Lasrado
f37a5ddff5
allow bom field removed from Item Master
2015-01-19 17:05:05 +05:30
Anand Doshi
938ed1a57d
[minor] fixed patch update_companywise_payment_account
2015-01-19 16:20:26 +05:30
Anand Doshi
f02e142d5d
[design] mobile
2015-01-19 15:59:45 +05:30
Anand Doshi
b942cb86ae
[minor] auto-create Fiscal Year, loading, general ledger
2015-01-19 15:59:45 +05:30
Nabin Hait
5031f90ac1
bank reconciliation fix
2015-01-19 14:51:21 +05:30
Pratik Vyas
4ab09fab11
Update .travis.yml
2015-01-19 14:36:32 +05:30
Nabin Hait
cff8993478
Merge pull request #2572 from neilLasrado/credit-note
...
journal entry linked with Stock Entry
2015-01-19 14:26:58 +05:30
Nabin Hait
9ef2e78905
Merge pull request #2553 from neilLasrado/mode-of-payment
...
mode of payment - company wise default account added
2015-01-19 14:26:00 +05:30
Nabin Hait
b434464b1c
Merge pull request #2604 from nabinhait/fix1
...
Fixes
2015-01-19 11:10:39 +05:30
Nabin Hait
aabeb38c15
minor fix
2015-01-19 11:07:32 +05:30
Nabin Hait
fe93ea56b6
Minor fixes: escaped characters
2015-01-19 11:07:32 +05:30
Pratik Vyas
b301603740
Merge branch 'develop'
2015-01-17 01:42:05 +05:30
Pratik Vyas
d7ba759844
bumped to version 4.18.1
2015-01-17 02:12:05 +06:00
Nabin Hait
dd4617d30f
Opportunity From field is mandatory
2015-01-16 15:08:00 +05:30
Nabin Hait
8efe58bd3c
Merge pull request #2591 from nabinhait/fix1
...
Fixes
2015-01-16 12:03:49 +05:30
Nabin Hait
6609938483
Removed validation: target_valuation > source_valuation
2015-01-16 11:59:47 +05:30
Nabin Hait
84662f2db5
minor fix in payment receipt voucher print format
2015-01-16 11:59:47 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Nabin Hait
239c2c327c
Hide currency and price list section after submission
2015-01-15 14:22:04 +05:30
Nabin Hait
45a5d52a2a
minor changes in packing slip
2015-01-15 14:22:04 +05:30
Rushabh Mehta
5293aa7ca0
[ui] setup wizard
2015-01-15 12:07:02 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
f2b1f2658d
patch fix
2015-01-14 12:06:20 +05:30
Neil Trini Lasrado
bd2ac2f51f
mode of payment - company wise default account added
2015-01-14 12:00:17 +05:30
Neil Trini Lasrado
9235c6d65a
update stock_entry.py
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
50763d58ce
frappe.db.exist used
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
adfdd6f83c
journal entry linked and validation added
2015-01-14 11:54:55 +05:30
Nabin Hait
da975f5a76
Merge pull request #2581 from nabinhait/fix1
...
minor fix
2015-01-14 11:49:46 +05:30
Nabin Hait
f34c96bf7a
minor fix
2015-01-14 11:49:04 +05:30
Pratik Vyas
0f96f8e68f
Merge branch 'develop'
2015-01-14 11:42:45 +05:30
Pratik Vyas
991962b6fd
bumped to version 4.18.0
2015-01-14 12:12:45 +06:00
Nabin Hait
c481e27d88
Merge pull request #2565 from alexandre-00/patch-11
...
Update bom.py
2015-01-14 11:39:08 +05:30
Nabin Hait
56e04e0727
Merge pull request #2576 from nabinhait/fix1
...
Discount amount in party currency
2015-01-14 11:27:30 +05:30
Nabin Hait
0bcf3e307c
Merge pull request #2579 from neilLasrado/jv-fix
...
Journal entries recalc totals on del of accounts table row
2015-01-14 11:27:25 +05:30
Nabin Hait
60700e30b4
Merge pull request #2580 from neilLasrado/dirty-code
...
dirty code cleanup
2015-01-14 11:27:06 +05:30
Neil Trini Lasrado
73cad76010
dirty code cleanup
2015-01-13 13:55:34 +05:30
Neil Trini Lasrado
e3e3a56b5c
Journal entries recalc totals on del of accounts table row
2015-01-13 12:33:15 +05:30
Nabin Hait
2244ac4d52
Discount amount in party currency
2015-01-12 17:35:37 +05:30
Nabin Hait
024b537b7f
Merge pull request #2557 from neilLasrado/spelling-of-approver
...
Spelling Correction - Leave application #2552
2015-01-12 17:02:10 +05:30
Nabin Hait
d68115645f
Merge pull request #2574 from neilLasrado/fiscal-year-fix
...
get fiscal year fix
2015-01-12 17:01:48 +05:30
Neil Trini Lasrado
0866272ba1
get fiscal year fix
2015-01-12 16:41:55 +05:30
Rushabh Mehta
135fe3405f
[ui] listviews
2015-01-12 16:11:02 +05:30
Pratik Vyas
e4ee5c3f1c
Update .travis.yml
2015-01-12 12:48:27 +05:30
Pratik Vyas
4b3d99d39a
Merge branch 'develop'
2015-01-12 12:14:36 +05:30
Pratik Vyas
47a10f5a39
bumped to version 4.17.0
2015-01-12 12:44:35 +06:00
Nabin Hait
ecb39a5b63
Merge pull request #2571 from nabinhait/fix1
...
Fixes
2015-01-12 11:04:50 +05:30
Nabin Hait
39c8c9e7b0
Fixes in print format css
2015-01-12 11:04:07 +05:30
Nabin Hait
4e7cc93af9
minor fix in reposting utility
2015-01-12 10:55:48 +05:30
Rushabh Mehta
f8cb1a916e
Merge pull request #2570 from dalers/develop
...
fix web links and clarify install options
2015-01-12 10:47:06 +05:30
Dale Scott
ab2e75e98e
Update README.md
2015-01-11 11:04:43 -07:00
Dale Scott
354892b1c6
Update README.md
2015-01-11 11:01:01 -07:00
Dale Scott
abe69afd69
corrections and clarifications
...
mostly current websites for user guide, forum, ...
2015-01-11 10:38:03 -07:00
Nabin Hait
c72a89aaf8
Merge pull request #2569 from nabinhait/fix1
...
create material request from production planning tool
2015-01-11 22:04:07 +05:30
Nabin Hait
873d98be2d
create material request from production planning tool
2015-01-11 22:01:59 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +05:30
Nabin Hait
f1d06b02e7
Merge pull request #2567 from nabinhait/fix1
...
valuation rate mandatory if item is transacting for the first time
2015-01-10 10:31:34 +05:30
Nabin Hait
675276b802
valuation rate mandatory if item is transacting for the first time
2015-01-10 10:27:28 +05:30
alexandre-00
3ed3a2d176
Update bom.py
...
removed the attrgetter
2015-01-09 14:42:27 +08:00
Rushabh Mehta
9e95e780da
Merge pull request #2560 from neilLasrado/test-fix
...
opportunity - test records fixed
2015-01-09 12:03:28 +05:30
alexandre-00
de58657537
Update bom.py
...
Hi guys,
Just a proposal to sort the Materials Required (Exploded) from the BOM.
So the items and sub-assemblies items looks a little bit more organized in the list.
Cheers
Alexandre
2015-01-09 14:20:43 +08:00
Anand Doshi
015fa7a1d1
[fix] escape quote in Accounts Receivable
2015-01-08 18:26:53 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
1ff3a6cdb8
fix
2015-01-07 16:24:52 +05:30
Nabin Hait
7620efc9ad
Merge pull request #2561 from nabinhait/fix1
...
fix reposting gl entries for future vouchers
2015-01-07 15:49:35 +05:30
Nabin Hait
7778b480fd
fix reposting gl entries for future vouchers
2015-01-07 15:45:10 +05:30
Neil Trini Lasrado
a17d7cea34
test records fixed
2015-01-07 15:42:59 +05:30
Anand Doshi
7b34ebe89d
[minor] Translated status change comment
2015-01-07 15:41:47 +05:30
Pratik Vyas
a9cafcb8ae
Merge branch 'develop'
2015-01-07 11:37:22 +05:30
Pratik Vyas
bdfd0d1ff9
bumped to version 4.16.0
2015-01-07 12:07:22 +06:00
Nabin Hait
afc8b1a087
Merge pull request #2558 from nabinhait/fix1
...
message changed
2015-01-07 11:34:42 +05:30
Nabin Hait
6c1773025b
fiscal year error message
2015-01-07 11:33:14 +05:30
Neil Trini Lasrado
1b7d66fab6
Update leave_application.js
2015-01-07 11:16:41 +05:30
Rushabh Mehta
738d4ef5c8
[ui] [listviews] indicators
2015-01-06 18:09:02 +05:30
Anand Doshi
50d7e8cf8f
[design] Point of Sale
2015-01-06 17:14:26 +05:30
Nabin Hait
e24365f1f4
message fix
2015-01-06 12:57:23 +05:30
Rushabh Mehta
e1cb0ae738
[design] list views
2015-01-05 17:39:05 +05:30
Anand Doshi
9b955feff8
[design] POS - item grid and taxes
2015-01-05 16:19:12 +05:30
Nabin Hait
fd334bf451
Merge pull request #2551 from nabinhait/fix1
...
minor fix
2015-01-05 08:20:08 +05:30
Nabin Hait
5515b1ea7f
minor fix
2015-01-05 08:18:15 +05:30
Nabin Hait
96d67f5153
Merge pull request #2547 from nabinhait/fix1
...
minor fix
2015-01-04 17:29:14 +05:30
Nabin Hait
8a00319962
minor fix
2015-01-04 17:27:40 +05:30
Nabin Hait
c6136e4801
Merge pull request #2543 from nabinhait/fix1
...
FG item and raw material can not be merged
2015-01-02 15:13:17 +05:30
Nabin Hait
0938b5dec6
FG item and raw material can not be merged
2015-01-02 15:12:30 +05:30
Rushabh Mehta
ff58261407
[icons] mfg and shopping cart
2015-01-02 14:40:48 +05:30
Nabin Hait
88f8fcb32e
Merge pull request #2542 from nabinhait/fix1
...
In stock entry, difference account can be non-profit-and-loss account
2015-01-02 14:37:43 +05:30
Nabin Hait
f40ce616a7
In stock entry, difference account can be non-profit-and-loss account
2015-01-02 14:37:01 +05:30
Nabin Hait
ebc4ae7892
patch fixes
2015-01-02 12:46:49 +05:30
Rushabh Mehta
b8b79173e5
Merge pull request #2541 from pdvyas/travis-bench
...
use bench to run tests on travis
2015-01-01 18:05:34 +05:30
Anand Doshi
3f5e95a99e
[design] Fixed Grid Reports
2015-01-01 16:26:18 +05:30
Pratik Vyas
ca012eb1f8
add auto email id to test site
2015-01-01 16:03:58 +05:30
Rushabh Mehta
90e270a8aa
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:40 +05:30
Rushabh Mehta
4c36d7388c
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:34 +05:30
Pratik Vyas
2a47eeb872
use bench to run tests on travis
2015-01-01 15:48:04 +05:30
Nabin Hait
56ac3fb29d
some fixes for renaming patch
2015-01-01 13:40:54 +05:30
Rushabh Mehta
bfaf0a8f43
[tree] [ui]
2015-01-01 12:49:18 +05:30
Rushabh Mehta
7a8f009116
[fixes]
2014-12-31 15:34:37 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Rushabh Mehta
ee4b8bee33
Revert "[patches] removed 4.0 patches"
...
This reverts commit 6f7cba8d73 .
2014-12-31 15:01:48 +05:30
Rushabh Mehta
7b822abcd6
[desktop] new icons
2014-12-31 14:42:23 +05:30
Nabin Hait
cbdfb767a9
patch fix
2014-12-31 13:30:36 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Pratik Vyas
b02788b915
Merge branch 'develop'
2014-12-31 12:41:14 +05:30
Pratik Vyas
b094ee45d7
bumped to version 4.15.4
2014-12-31 13:11:14 +06:00
Nabin Hait
de0c87757a
Merge pull request #2539 from nabinhait/fix1
...
item validation in bom
2014-12-31 12:37:38 +05:30
Nabin Hait
5604f987f2
item validation in bom
2014-12-31 12:37:11 +05:30
Nabin Hait
a4e547d71d
minor fix
2014-12-31 12:08:13 +05:30
Nabin Hait
9d14f0f36a
Merge pull request #2538 from nabinhait/fix1
...
set missing cost center using default
2014-12-30 18:35:14 +05:30
Nabin Hait
a74468b353
set missing cost center using default
2014-12-30 18:33:52 +05:30
Rushabh Mehta
afbfdcf552
[ui] minor fixes
2014-12-30 18:11:32 +05:30
Nabin Hait
35f81b24f1
Merge pull request #2537 from nabinhait/fix1
...
focus on barcode field after adding a row
2014-12-30 17:53:58 +05:30
Nabin Hait
40431cbf89
focus on barcode field after adding a row
2014-12-30 17:53:16 +05:30
Nabin Hait
5529f14aaf
Merge pull request #2536 from nabinhait/fix1
...
Fixes in Stock Analytics
2014-12-30 16:35:57 +05:30
Nabin Hait
54c31b498b
Fixes in Stock Analytics
2014-12-30 16:33:07 +05:30
Nabin Hait
899dba9022
Merge pull request #2535 from nabinhait/fix1
...
always calculate taxes and totals onchange of exchange rate
2014-12-30 15:41:22 +05:30
Nabin Hait
7d8fa8089a
always calculate taxes and totals onchange of exchange rate
2014-12-30 15:35:59 +05:30
Pratik Vyas
ac86c5b6d1
Merge branch 'develop'
2014-12-28 16:59:08 +05:30
Pratik Vyas
ecc3f312b9
bumped to version 4.15.3
2014-12-28 17:29:08 +06:00
Nabin Hait
dd38a266b8
Removed tname and fname from code
2014-12-26 13:15:21 +05:30
Rushabh Mehta
a5b149c061
[design] module pages, messages, timelines
2014-12-26 12:53:02 +05:30
Rushabh Mehta
4096a3ab2b
[design] form toolbar
2014-12-26 12:53:02 +05:30
Rushabh Mehta
6f7cba8d73
[patches] removed 4.0 patches
2014-12-26 12:53:01 +05:30
Rushabh Mehta
a9ba5eff99
[design] pos
2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe
field renaming
2014-12-26 11:41:15 +05:30
Nabin Hait
b65b5f43a7
Merge pull request #2530 from nabinhait/fix1
...
exchange_rate no_copy fix
2014-12-26 11:00:03 +05:30
Nabin Hait
c3270d7504
exchange_rate no_copy fix
2014-12-26 10:58:58 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
2eed5a35e3
fixed capacilty planning patch
2014-12-24 10:41:55 +05:30
Pratik Vyas
ea909ace01
Merge branch 'develop'
2014-12-23 19:11:08 +05:30
Pratik Vyas
f64d11da3c
bumped to version 4.15.2
2014-12-23 19:41:08 +06:00
Nabin Hait
0741ed3a82
Merge pull request #2472 from neilLasrado/expense-claim
...
New feature for issue #2419
2014-12-23 18:07:38 +05:30
Nabin Hait
57595cf73b
fixed merge conflict
2014-12-23 18:05:13 +05:30
Neil Trini Lasrado
31a92bd9d9
company wise letter head feature added
2014-12-23 17:52:41 +05:30
Nabin Hait
b0b7e7fdf8
Merge pull request #2497 from neilLasrado/batch-redesign
...
batch redesigned
2014-12-23 17:44:41 +05:30
Nabin Hait
95225be93d
Merge pull request #2509 from pdvyas/fix-patches
...
add reload_doc in a few patches
2014-12-23 17:43:52 +05:30
Nabin Hait
496dfc4bbf
Merge branch 'neil_capacity_planning' into v5.0
2014-12-23 17:40:46 +05:30
Nabin Hait
89c52eacc7
Actual operation cost in stock entry, fixed cost removed from bom and workstation
2014-12-23 17:39:00 +05:30
Nabin Hait
0de6256bcc
time log and workstations
2014-12-23 17:39:00 +05:30
Nabin Hait
0f4350dd61
capacity planning fixes and cleanup
2014-12-23 17:39:00 +05:30
Nabin Hait
1fa7171bfa
minor fixes
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
41781ce686
test case fix - holiday list
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
9712e7dad4
holiday logic removed
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
e84fa67f30
Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
...
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
5ec7542519
Holiday List name changed and workstation filter added to time log
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
812cd8a8ce
Prod Order Form Modified
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd
Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log
2014-12-23 17:38:59 +05:30
Nabin Hait
e5d169b8d2
Merge pull request #2521 from nabinhait/fix1
...
fixed negative batch wty message
2014-12-23 11:26:04 +05:30
Nabin Hait
da4e3fb366
fixed negative batch wty message
2014-12-23 10:58:01 +05:30
Nabin Hait
13ce150149
Merge pull request #2520 from nabinhait/fix1
...
minor fix no-copy
2014-12-22 15:07:28 +05:30
Nabin Hait
a04489a72b
minor fix no-copy
2014-12-22 14:58:36 +05:30
Pratik Vyas
35cd88b09b
Merge branch 'develop'
2014-12-22 11:17:45 +05:30
Pratik Vyas
ff56566506
bumped to version 4.15.1
2014-12-22 11:47:45 +06:00
Nabin Hait
01ad94bfad
Merge pull request #2519 from nabinhait/fix1
...
Dont reset pricing if ignore pricing rule
2014-12-22 11:16:02 +05:30
Nabin Hait
cfe3c54ca0
Dont reset pricing if ignore pricing rule
2014-12-22 10:43:10 +05:30
Pratik Vyas
2f6a20a93a
Merge branch 'develop'
2014-12-19 18:13:55 +05:30
Pratik Vyas
5d1543f241
bumped to version 4.15.0
2014-12-19 18:43:55 +06:00
Nabin Hait
c56650c773
Merge pull request #2516 from nabinhait/fix1
...
Customer should not copied from lead to opoortunity
2014-12-19 10:52:52 +05:30
Nabin Hait
cb11f27558
Customer should not copied from lead to opoortunity
2014-12-19 10:51:59 +05:30
Anand Doshi
98be98816c
Merge pull request #2515 from anandpdoshi/anand-dec-18
...
[fix] In Setup Wizard, load languages from languages.txt
2014-12-18 17:40:58 +05:30
Anand Doshi
ca2c297f72
[fix] In Setup Wizard, load languages from languages.txt
2014-12-18 17:31:21 +05:30
Pratik Vyas
0a726e2335
add reload doc to patch
2014-12-18 12:41:09 +05:30
Pratik Vyas
387e1e21cb
add reload_doc in a few patches
2014-12-18 11:36:23 +05:30
Pratik Vyas
dc2630b7fa
Make Tax Assets a group in standard chart of accounts
2014-12-17 16:23:51 +05:30
Nabin Hait
f4ec673a06
Merge pull request #2488 from neilLasrado/bom-currency-fix
...
Bom Currency Fix
2014-12-17 15:42:13 +05:30
Nabin Hait
d6e49150a8
Merge pull request #2505 from nabinhait/fix1
...
Reapply price list if pricing rule reset as blank
2014-12-17 15:39:28 +05:30
Nabin Hait
49a2729663
Reapply price list if pricing rule reset as blank
2014-12-17 11:24:00 +05:30
Pratik Vyas
06baf20edd
Merge branch 'develop'
2014-12-16 15:47:07 +05:30
Pratik Vyas
13553c2bf0
bumped to version 4.14.0
2014-12-16 16:17:06 +06:00
Nabin Hait
f638c1acd5
Merge pull request #2503 from nabinhait/fix1
...
packing list index
2014-12-16 15:17:27 +05:30
Nabin Hait
e4c659386a
packing list index
2014-12-16 15:16:55 +05:30
Nabin Hait
6ffa445dfd
minor fixes in coa templates
2014-12-16 12:49:35 +05:30
Nabin Hait
b072c74efc
render address and contacts for party
2014-12-16 12:49:13 +05:30
Anand Doshi
cd7a1661c6
Merge pull request #2498 from anandpdoshi/anand-dec-15
...
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-16 12:42:40 +05:30
Nabin Hait
96962e2101
Merge pull request #2501 from nabinhait/fix1
...
Fecth contact details on change of contact in purchase transactions
2014-12-16 11:57:11 +05:30
Nabin Hait
7eedebc970
Fecth contact details on change of contact in purchase transactions
2014-12-16 11:56:21 +05:30
Nabin Hait
437e34accb
Merge pull request #2500 from nabinhait/fix1
...
no copy property for customer's po no
2014-12-16 11:26:08 +05:30
Nabin Hait
0f2137be18
no copy property for customer's po no
2014-12-16 10:37:55 +05:30
Anand Doshi
f87a622ef0
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-15 23:14:35 +05:30
Neil Trini Lasrado
26320fc755
batch redesigned
2014-12-15 17:42:33 +05:30
Nabin Hait
07722b835c
Merge pull request #2495 from nabinhait/fix1
...
Translation fixes
2014-12-15 15:00:12 +05:30
Nabin Hait
3cd7a45c1b
Translation fixes
2014-12-15 14:56:58 +05:30
Nabin Hait
b2a84c7cd9
modified date updated in supplier.json
2014-12-15 14:22:14 +05:30
Nabin Hait
606af96c9f
minor fix
2014-12-15 11:57:19 +05:30
Nabin Hait
90b5174256
minor fix
2014-12-15 11:48:43 +05:30
Pratik Vyas
bffad26226
Merge branch 'develop'
2014-12-12 16:52:09 +05:30
Pratik Vyas
a578f3e23a
bumped to version 4.13.1
2014-12-12 17:22:09 +06:00
Neil Trini Lasrado
1d66b71464
patch fix
2014-12-12 14:48:30 +05:30
Neil Trini Lasrado
e1f21682fb
changes made
2014-12-12 13:09:42 +05:30
Nabin Hait
870dd43268
Merge pull request #2489 from nabinhait/fix1
...
Pull all customer's po no in delivery note when made from multiple SO
2014-12-12 12:50:41 +05:30
Nabin Hait
ad0bd4ca92
Pull all customer's po no in delivery note when made from multiple sales order
2014-12-12 12:49:45 +05:30
Neil Trini Lasrado
cc73999497
validate fixed
2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
f13c4f0145
New feature for issue #2419
2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
8d34417c44
Bom currency feilds changed to type currency and company feild added to BOM
2014-12-12 11:33:50 +05:30
Nabin Hait
eba480e15a
Merge pull request #2487 from nabinhait/fix1
...
Fixed bom patch
2014-12-12 11:29:49 +05:30
Nabin Hait
4b83403a63
Fixed bom patch
2014-12-12 11:28:58 +05:30
Nabin Hait
a94478a618
Merge pull request #2390 from ankitjavalkarwork/fix2314
...
Add selectable BOM field for Subcontracted Item
2014-12-11 17:41:45 +05:30
Nabin Hait
abfc72ded4
Merge pull request #2450 from ankitjavalkarwork/fix2363
...
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-11 17:40:54 +05:30
Nabin Hait
4f7c51d68e
Merge pull request #2442 from ankitjavalkarwork/gross-profit
...
Gross profit
2014-12-11 17:37:54 +05:30
Nabin Hait
22c9e42f4d
Merge pull request #2482 from neilLasrado/fix-cost
...
Fixed cost calculation Error
2014-12-11 17:36:49 +05:30
Neil Trini Lasrado
6ddc487fb6
patch fix
2014-12-11 17:33:41 +05:30
Nabin Hait
a870d540b5
Merge pull request #2458 from neilLasrado/bom-redesign
...
BOM doctype design modified. Quality feild moved from 'More Section' to ...
2014-12-11 17:25:58 +05:30
Nabin Hait
1656839c1b
Merge pull request #2459 from neilLasrado/PO-status-indicator
...
Fix for "Stopped" status indicator in Purchase Order List View
2014-12-11 17:25:22 +05:30
Nabin Hait
df60e0282e
Merge pull request #2475 from neilLasrado/sales-invoice
...
sales Invoice- filter added for debit to
2014-12-11 17:16:08 +05:30
Neil Trini Lasrado
3a34cadcb2
Fix - Total Fixed Cost with patch
2014-12-11 17:15:12 +05:30
Nabin Hait
b71d1a4c7f
Merge pull request #2486 from nabinhait/fix1
...
Removed gross profit field from sales invoice
2014-12-11 17:14:26 +05:30
Nabin Hait
bef80bab0d
Removed gross profit field from sales invoice
2014-12-11 16:27:18 +05:30
Nabin Hait
190210394c
Merge pull request #2484 from nabinhait/fix1
...
Leave application fix
2014-12-11 00:02:38 +05:30
Nabin Hait
5cafcf66b0
Leave application fix
2014-12-10 23:59:04 +05:30
Nabin Hait
d71e50c9fc
Merge pull request #2480 from nabinhait/fix1
...
Fixes for discount amount
2014-12-10 12:44:56 +05:30
Nabin Hait
35ebe1bf78
Tax amount in POS invoice print format
2014-12-10 12:42:32 +05:30
Nabin Hait
b14cc0417d
Display tax amount after discount, if there is any discount amount
2014-12-10 12:28:25 +05:30
Neil Trini Lasrado
c0063a6e74
sales Invoice- filter added for debit to
2014-12-09 17:03:13 +05:30
Pratik Vyas
399a3097e8
Merge branch 'develop'
2014-12-09 16:40:28 +05:30
Pratik Vyas
c8f5c3cdbe
bumped to version 4.13.0
2014-12-09 17:10:28 +06:00
Nabin Hait
e83d506319
Merge pull request #2474 from nabinhait/fix1
...
Added leave approver name field in leave application
2014-12-09 16:37:40 +05:30
Nabin Hait
690bcd7b66
Added leave approver name field in leave application
2014-12-09 16:36:33 +05:30
Nabin Hait
f18d285eab
Merge pull request #2473 from nabinhait/fix1
...
minor fix
2014-12-09 16:31:03 +05:30
Nabin Hait
7887ccb441
Credit days fix
2014-12-09 14:34:14 +05:30
Nabin Hait
d57b57a21d
Minor fix in accounts receivable report
2014-12-09 11:56:13 +05:30
erp
9fc0a8cbf8
first is translation commit
2014-12-05 11:17:44 +00:00
ankitjavalkarwork
5edae0e47b
[ #2314 ] Add selectable BOM field for Subcontracted Item
2014-12-04 15:54:54 +05:30
Neil Trini Lasrado
355dfe52ab
Fix for "Stopped" status indicator in Purchase Order List View
...
Issue #2368
2014-12-04 13:34:27 +05:30
ankitjavalkarwork
35db282765
Fix gross_profit.py, commonify and add elementwise grouping to report
2014-12-04 13:08:42 +05:30
Neil Trini Lasrado
c73f4f70e4
BOM doctype design modified. Quality feild moved from 'More Section' to 'Materials Section'
...
[fix] Issue #2404
2014-12-04 12:42:23 +05:30
Rushabh Mehta
ec9db4b799
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
Rushabh Mehta
969069fbf9
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
Rushabh Mehta
9f32a50379
[merge] fix
2014-12-03 12:35:19 +05:30
ankitjavalkarwork
c41a0e2e38
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-02 15:13:36 +05:30
Nabin Hait
5cc0531d27
Merge pull request #2451 from revant/develop
...
"From time" cannot be later than "To time" and hours cannot be negative
2014-12-02 14:27:00 +05:30
Revant Nandgaonkar
0e5cdc8495
Merge branch 'develop' of https://github.com/revant/erpnext into develop
2014-12-02 14:21:15 +05:30
Revant Nandgaonkar
b80d892eab
removed unecessary backslash
2014-12-02 14:19:29 +05:30
Revant Nandgaonkar
185af03fb2
Update time_log.py
2014-12-02 14:18:10 +05:30
Nabin Hait
eca7e22cda
Shopping cart test fixed
2014-12-02 11:35:29 +05:30
Nabin Hait
abcbbc63d8
Merge pull request #2435 from nabinhait/fix1
...
Fixes in authorization rule based on average discount
2014-12-02 10:36:25 +05:30
Nabin Hait
6871c74ce1
Merge pull request #2444 from ankitjavalkarwork/contactmob
...
Display mobile no. of contact
2014-12-02 10:35:46 +05:30
Revant Nandgaonkar
d0a44ca85c
Changed contact_date to Datetime so appointment or call with time can be scheduled
2014-12-01 23:31:53 +05:30
Revant Nandgaonkar
83db3e3ddb
"From time" cannot be later than "To time" and hours cannot be negative
2014-12-01 16:53:29 +05:30
Nabin Hait
cc11045fd3
minor fix
2014-11-28 16:59:32 +05:30
Nabin Hait
1b5afe737f
Fixes in authorization rule based on average discount
2014-11-28 16:59:32 +05:30
Rushabh Mehta
3d65d9602e
[error-reports]
2014-11-28 14:58:43 +05:30
Rushabh Mehta
1913d5b366
[series] for Issue
2014-11-28 14:27:46 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
Rushabh Mehta
bd9b62ff28
[rename] Support Ticket -> Issue
2014-11-28 11:46:10 +05:30
Nabin Hait
1caa1a3708
Fixed party model patch
2014-11-28 11:26:35 +05:30
ankitjavalkarwork
9440d080d4
Print Hide Recurring Order/Invoice based fields
2014-11-27 17:28:53 +05:30
ankitjavalkarwork
9269c86339
Display mobile no of contact
2014-11-27 17:13:36 +05:30
Nabin Hait
789b74257e
test case fixes
2014-11-27 15:22:24 +05:30
Nabin Hait
40fffc0f4d
fixes during testing version 5
2014-11-26 15:43:27 +05:30
Nabin Hait
249bbbc56f
fixes during testing version 5
2014-11-26 15:35:39 +05:30
Nabin Hait
9ed41b3abb
Reordered Item fields
2014-11-26 10:54:11 +05:30
Pratik Vyas
7c82d616c9
Merge branch 'develop'
2014-11-25 11:16:33 +05:30
Pratik Vyas
f227379d2f
bumped to version 4.12.0
2014-11-25 11:46:33 +06:00
Nabin Hait
6141b80704
Merge pull request #2414 from ankitjavalkarwork/fix1738
...
[#1738 ] Required Date field in po_details auto-copied in all rows
2014-11-25 10:57:15 +05:30
Nabin Hait
eba88919c1
Merge pull request #2431 from mayur-patel/patch-2
...
Update leave_application.py : Modified get_holidays function
2014-11-25 10:55:11 +05:30
Rushabh Mehta
3408432b50
Merge pull request #2428 from rmehta/translations-update
...
[translations] updated via frappe.io/translator
2014-11-25 10:54:36 +05:30
Rushabh Mehta
a0949158b7
[translations] updated via frappe.io/translator
2014-11-25 10:53:12 +05:30
Nabin Hait
ea91d2aaf1
Merge pull request #2429 from ankitjavalkarwork/expclaimname
...
Add configurable naming series to Expense claim
2014-11-25 10:51:03 +05:30
Rushabh Mehta
de992abf83
Merge pull request #2413 from Delte/patch-1
...
Update tr.csv
2014-11-25 10:49:51 +05:30
Mayur Patel
5d8635a8dc
Update leave_application.py
...
See issue #2422 for more detail.
2014-11-24 16:57:53 +00:00
ankitjavalkarwork
7e911bae95
Add configurable naming series to Expense claim
2014-11-24 18:26:17 +05:30
Nabin Hait
0676cf6d3f
Merge pull request #2430 from nabinhait/fix1
...
Multiple minor fixes
2014-11-24 18:21:37 +05:30
Nabin Hait
b74ae7aa31
Minor fix for order to invoice mapping
2014-11-24 18:17:01 +05:30
Nabin Hait
0ad7db3bbd
Minor fix in salary slip net total calculation
2014-11-24 15:25:13 +05:30
Nabin Hait
db74e316d2
Validate serial no after auto-creation based on naming series
2014-11-24 15:25:13 +05:30
Nabin Hait
1897360e4b
Set default language as English in setup wizard
2014-11-24 15:25:13 +05:30
Nabin Hait
e7fb957415
Merge pull request #2427 from rmehta/develop
...
[fix] client side queries
2014-11-24 15:23:27 +05:30
Rushabh Mehta
2f4567fa3c
[minor] [ux] address refresh for lead
2014-11-24 15:18:40 +05:30
Rushabh Mehta
0a7abc188e
[minor] [ux] contact template
2014-11-24 15:06:40 +05:30
Rushabh Mehta
5eeef7f065
[refactor] address and contact list in customer, supplier, lead, sales person
2014-11-24 14:16:51 +05:30
Rushabh Mehta
7d36875d6f
[refactor] address and contact list in customer, supplier, lead, sales person
2014-11-24 14:16:47 +05:30
Rushabh Mehta
909758d36e
Merge pull request #2418 from pdvyas/fix-patch
...
fix Mailbox migration patch
2014-11-20 11:42:50 +05:30
Pratik Vyas
85a354f2fb
fix Mailbox migration patch
2014-11-20 11:41:30 +05:30
ankitjavalkarwork
15ea5cc972
[ #1738 ] Required Date field in po_details auto-copied in all rows
2014-11-17 13:26:43 +05:30
Delte
2fa718705a
Update tr.csv
...
Typo & translation fix
2014-11-15 22:39:25 +02:00
Nabin Hait
707322adb9
Fixes for standard chart of accounts
2014-11-14 18:13:33 +05:30
Nabin Hait
601fcde31c
Merge pull request #2383 from neilLasrado/pos
...
POS feature #2305
2014-11-14 18:12:26 +05:30
Nabin Hait
40c47b2236
Merge pull request #2395 from ankitjavalkarwork/fix2230
...
[#2230 ] Add Totals row to Gross Profit report
2014-11-14 18:06:19 +05:30
Nabin Hait
f8b7633c63
Merge pull request #2398 from ankitjavalkarwork/fix2179
...
Delete events linked with employee on deletion of Employee
2014-11-14 18:05:11 +05:30
Nabin Hait
0bff25c7cb
Merge pull request #2401 from ankitjavalkarwork/fix2219
...
[#2219 ] Re-Order Level Validation: Warehouse cannot have two reorders for same item
2014-11-14 18:04:07 +05:30
Nabin Hait
69ab2ffb5c
Merge pull request #2409 from ankitjavalkarwork/fixbomerror
...
Fix Error message, add account_type to 'inventories' in Chart Of Acc.
2014-11-14 18:02:44 +05:30
Pratik Vyas
b1fdbf2335
Merge branch 'develop'
2014-11-14 15:27:34 +05:30
Pratik Vyas
2277922313
bumped to version 4.11.2
2014-11-14 15:57:34 +06:00
Nabin Hait
3e1029309c
Merge pull request #2411 from nabinhait/fix1
...
minor fix
2014-11-14 15:19:51 +05:30
Nabin Hait
aa5deaa070
minor fix
2014-11-14 15:19:07 +05:30
Nabin Hait
6b5d51ca22
Merge pull request #2402 from jorxzpagta/patch-1
...
Update supplier.js [Displaying Messages on the Communation History]
2014-11-14 15:05:11 +05:30
Nabin Hait
2c114b5bb5
Merge pull request #2407 from ankitjavalkarwork/packingsliphead
...
Add letterhead field and mapper in Packing Slip
2014-11-14 14:50:28 +05:30
Nabin Hait
bd38a79e5e
Merge pull request #2410 from nabinhait/fix1
...
Minor fixes
2014-11-14 14:48:02 +05:30
Nabin Hait
ccd9fd3e94
Rounding in totals calculation
2014-11-14 14:27:24 +05:30
ankitjavalkarwork
fff1b42f80
Fix Error message, add account_type to 'inventories' in Chart Of Acc.
2014-11-14 14:19:06 +05:30
Nabin Hait
4215b3afc3
temporary fix in payment tool
2014-11-14 10:51:31 +05:30
ankitjavalkarwork
f60f111afe
Add letterhead field and mapper in Packing Slip
2014-11-13 17:28:42 +05:30
Nabin Hait
a6a70a5f35
Make email account patch
2014-11-12 17:00:42 +05:30
jorxzpagta
6fe0a3cee3
Update supplier.js
...
Display Messages on the Communication History
2014-11-12 17:02:06 +08:00
Nabin Hait
4cd60d7d61
Included standard charts in json format
2014-11-12 14:29:44 +05:30
Nabin Hait
4963ac2af5
charts for brazil
2014-11-12 14:29:44 +05:30
Nabin Hait
f3d7ef3a1b
Chart of accounts name cleanup
2014-11-12 14:29:44 +05:30
Nabin Hait
ed9c26db4d
Show only active and enabled charts for any country
2014-11-12 14:29:44 +05:30
Neil Trini Lasrado
737cedaeef
Required modifications done
2014-11-11 16:52:34 +05:30
Neil Trini Lasrado
2c388f9d7e
POS feature #2305
2014-11-11 16:00:09 +05:30
ankitjavalkarwork
338eb36811
[ #2219 ] Re-Order Level Validation: Warehouse cannot have two reorders for same item
2014-11-11 13:59:46 +05:30
Nabin Hait
f004077734
Map only pending qty from Material Request to Purchase Order/Stock Entry
2014-11-11 10:51:41 +05:30
ankitjavalkarwork
16e2c18c64
Delete events linked with employee on deletion of Employee
2014-11-10 18:08:23 +05:30
Nabin Hait
6c5cfd2148
Merge pull request #2396 from nabinhait/fix1
...
Reference / Cheque date is after due date
2014-11-10 18:07:52 +05:30
Nabin Hait
6c1011df92
Reference / Cheque date is after due date
2014-11-10 14:57:53 +05:30
Pratik Vyas
1582a0ce78
Merge branch 'develop'
2014-11-10 12:38:45 +05:30
Pratik Vyas
b5b821363d
bumped to version 4.11.1
2014-11-10 13:08:45 +06:00
ankitjavalkarwork
bd8a8b9bd7
[ #2230 ] Add Totals row to Gross Profit report
2014-11-10 12:36:43 +05:30
Nabin Hait
399afc87ef
Merge pull request #2379 from nathando/develop
...
Remove get_server_field from leave_application
2014-11-10 12:05:40 +05:30
Nabin Hait
012cc2cfe1
Merge pull request #2329 from neilLasrado/material-issue
...
Material Issue added to Material Request #2320
2014-11-10 12:04:01 +05:30
Nabin Hait
8c842af172
Merge pull request #2393 from nabinhait/fix1
...
Credit days and payment tool fixes
2014-11-10 11:44:37 +05:30
Nabin Hait
c3e87b0c02
Merge pull request #2394 from nabinhait/5_develop
...
Credit days validation fixes
2014-11-10 11:44:24 +05:30
Nabin Hait
d795dfd8de
Credit days validation fixes
2014-11-10 11:39:55 +05:30
Nabin Hait
bf836277f9
Payment tool fix: get outstanding sales orders
2014-11-10 11:28:25 +05:30
Nabin Hait
10d1806d81
Credit days validation fixes
2014-11-10 11:11:58 +05:30
Pratik Vyas
bc41ce95fc
Merge branch 'develop'
2014-11-06 14:36:51 +05:30
Pratik Vyas
4948d336c4
bumped to version 4.11.0
2014-11-06 15:06:51 +06:00
Nabin Hait
be2527d93d
Merge pull request #2386 from nabinhait/fix1
...
Translation fixed for Croatia
2014-11-06 12:52:59 +05:30
Nabin Hait
7f5bb1c8aa
Translation fixed for Croatia
2014-11-06 12:51:27 +05:30
Neil Trini Lasrado
6bde5868a9
Test Cases Fixed
2014-11-05 16:34:02 +05:30
Neil Trini Lasrado
6d8f48ff8d
Test Cases Added - Work Pending
2014-11-05 15:57:06 +05:30
Neil Trini Lasrado
f9ced8f28f
test-cases added
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
67e9081bbf
required modifications done
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
ce020cfb27
mapper added, type 'Transfer' renamed to 'Material Transfer', patch added
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
f24407e119
Material Issue added to Material Request Type
2014-11-05 15:46:32 +05:30
Pratik Vyas
a8d40e4409
Merge branch 'develop'
2014-11-05 14:15:47 +05:30
Pratik Vyas
e9b4686fec
bumped to version 4.10.0
2014-11-05 14:45:47 +06:00
Nabin Hait
ae1dcabcb5
Fixed merge conflict
2014-11-05 12:41:02 +05:30
Nabin Hait
5086ef2499
Update update_requested_and_ordered_qty.py
2014-11-05 12:33:29 +05:30
Nabin Hait
4a4125b3f4
Merge pull request #2377 from ankitjavalkarwork/apsumm
...
[#2362 ] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary
2014-11-05 11:47:03 +05:30
Nabin Hait
f73a7c1d17
Merge pull request #2376 from ankitjavalkarwork/fix2287
...
Delete Item Price on deletion of linked Item
2014-11-05 11:44:18 +05:30
Nathan Do
8a55d9a795
Remove get_server_field from leave_application
...
- Make get_holidays and get_total_leave_days global to module
- Replace get_server_field with using whitelisted function
get_total_leave_days
2014-11-05 12:32:57 +08:00
Nabin Hait
1caca80203
Merge pull request #2378 from nabinhait/fix1
...
Requested and ordered qty calculation
2014-11-04 18:06:00 +05:30
Nabin Hait
9114c26857
Patch to recalculate requested qty and ordered qty for all items
2014-11-04 15:34:03 +05:30
Nabin Hait
941a965af4
Ordered qty calculation logic
2014-11-04 15:34:03 +05:30
Nabin Hait
4acd431b92
Requested qty calculation logic
2014-11-04 15:34:03 +05:30
Nabin Hait
fad0d566f9
Payment receipt voucher print format fixed
2014-11-04 15:34:03 +05:30
ankitjavalkarwork
e6e65b0907
[ #2362 ] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary Report
2014-11-04 14:40:33 +05:30
Pratik Vyas
e2d4079363
Merge branch 'develop'
2014-11-03 16:04:30 +05:30
Pratik Vyas
b9ce1f590b
bumped to version 4.9.3
2014-11-03 16:34:29 +06:00
ankitjavalkarwork
a03eda54a2
Delete Item Price on deletion of linked Item
2014-11-03 16:00:28 +05:30
Nabin Hait
36463ed790
Merge pull request #2375 from nabinhait/fix1
...
Check credit limit only if customer debited
2014-11-03 15:55:03 +05:30
Nabin Hait
3c8838816d
Check credit limit only if customer debited
2014-11-03 15:49:29 +05:30
Nabin Hait
7b3543caaf
Check credit limit only if customer debited
2014-11-03 15:46:15 +05:30
Nabin Hait
98050e7646
default receivable / payable accounts in company
2014-11-03 15:46:15 +05:30
Nabin Hait
f09667884b
Root type indentified for multiple country's chart
2014-11-03 15:46:15 +05:30
Nabin Hait
aed3fc48ba
Add default party accounts in customer/supplier
2014-11-03 15:46:15 +05:30
Nabin Hait
0d421c1bf1
Minor fixes
2014-11-03 15:46:15 +05:30
Nabin Hait
11e50a8eee
Merge pull request #2366 from ankitjavalkarwork/fixprinthideamt
...
Hide totals in DN, Auto set Bank/Cash acc. in JV
2014-11-03 15:38:45 +05:30
Nabin Hait
9de4c60bd6
Merge pull request #2374 from nabinhait/fix1
...
minor fix
2014-11-03 15:37:51 +05:30
Nabin Hait
5288bdeabb
Minor fix
2014-11-03 15:08:21 +05:30
ankitjavalkarwork
f5804438bb
Auto set default bank/cash account on select of Bank/Cash Voucher in JV
2014-11-03 12:23:55 +05:30
ankitjavalkarwork
6e06357dc5
Hide totals on checking print_without_amount field in DN
2014-11-03 11:57:44 +05:30
Nabin Hait
28913b97b0
[fix] Null issue fixed in stock analytics report
2014-10-31 14:46:25 +05:30
Rushabh Mehta
98ae5bd9db
[form] show website link for website generator
2014-10-31 14:28:47 +05:30
Nabin Hait
e6370860a0
accounts receivable summary report cleanup
2014-10-30 15:54:40 +05:30
Nabin Hait
0822dcbde6
get query for bank/cash account
2014-10-30 15:54:40 +05:30
Nabin Hait
7dbcee87af
AR/AP report cleanup
2014-10-30 15:54:39 +05:30
Nabin Hait
99be941e7b
Party is only relevant to receivable/payable account
2014-10-30 15:54:39 +05:30
ankitjavalkarwork
574e55788f
[ #1379 ] Add Accounts Receivable Summary Report
2014-10-30 15:54:39 +05:30
ankitjavalkarwork
e63432db63
Commonify AR and AP reports
2014-10-30 15:54:39 +05:30
Pratik Vyas
c59cd46391
Merge branch 'develop'
2014-10-30 14:22:17 +05:30
Pratik Vyas
dda239fd49
bumped to version 4.9.2
2014-10-30 14:52:17 +06:00
Nabin Hait
b86a6ce26a
Merge pull request #2358 from nabinhait/fix1
...
[fix] Floating point issue fixed in payment reconciliation
2014-10-29 14:26:41 +05:30
Nabin Hait
ee212e7bb5
[fix] Floating point issue fixed in payment reconciliation
2014-10-29 14:26:05 +05:30
Nabin Hait
606b0427c5
Merge pull request #2349 from neilLasrado/validate-bom-fix
...
FIX validate-bom wrong condition
2014-10-28 17:08:15 +05:30
Neil Trini Lasrado
f92b026405
fixed
2014-10-28 14:50:47 +05:30
Neil Trini Lasrado
2c404cf34f
FIX validate-bom wrong condition
2014-10-28 14:50:47 +05:30
Nabin Hait
6c698e19ca
Merge pull request #2356 from neilLasrado/cost-center-undefined-error-fix
...
fix - validations added for auto fetch of cost center
2014-10-28 14:50:27 +05:30
Nabin Hait
a42e89d8a8
Merge pull request #2312 from neilLasrado/production-calender-sync
...
Production calender sync
2014-10-28 14:46:21 +05:30
Neil Trini Lasrado
6fc2821e5f
fix - validations added for auto fetch of cost center
2014-10-28 14:36:26 +05:30
Neil Trini Lasrado
df4b947e40
data type of start_date and end_date changed to datetime
2014-10-27 14:41:43 +05:30
Neil Trini Lasrado
4a75a42437
Filters added
2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
712cd7a426
Calender and gantt chart view added for production order doctype
2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
9d01133e49
start date and end date added to production order doctype
2014-10-27 13:37:41 +05:30
Nabin Hait
7cdb25b733
Merge pull request #2337 from neilLasrado/makepaymententryfix
...
Error fix, arguments in function call for Make Payment Entry from SI/PI
2014-10-27 11:42:50 +05:30
Nabin Hait
823774ee15
Merge pull request #2340 from neilLasrado/fixstockentryerror
...
Fix error in get_default_cost_center() function
2014-10-27 11:42:28 +05:30
Nabin Hait
60fbdecff4
Merge pull request #2341 from neilLasrado/shopping-cart-fix
...
shopping cart fix
2014-10-27 11:42:02 +05:30
Nabin Hait
4952c7b3b5
Merge pull request #2343 from ankitjavalkarwork/fixcustissue
...
Fix Customer Issue error on click event of Serial No. field
2014-10-27 11:40:18 +05:30
ankitjavalkarwork
4e61536f50
Fix Customer Issue error on click event of Serial No. field
2014-10-27 11:08:05 +05:30
Neil Trini Lasrado
d718c93726
shopping cart fix
2014-10-27 11:03:09 +05:30
Pratik Vyas
f2886f152b
Merge pull request #2348 from pdvyas/fix-pdf-test
...
Fix PDF test
2014-10-27 10:47:00 +05:30
Pratik Vyas
b5c56f6cea
[minor] add port to test site
2014-10-27 09:51:08 +05:30
Pratik Vyas
80e95388f5
Merge branch 'develop'
2014-10-27 09:26:36 +05:30
Pratik Vyas
daed0b655a
bumped to version 4.9.1
2014-10-27 09:56:36 +06:00
Nabin Hait
fbb994c731
Merge pull request #2344 from nabinhait/fix1
...
cost center based on project
2014-10-23 13:30:51 +05:30
Nabin Hait
10b155a486
cost center based on project
2014-10-23 13:18:59 +05:30
Nabin Hait
ce6eda709b
Merge pull request #2342 from ankitjavalkarwork/fixtimelogui
...
Change position of 'To Time' field for better UX
2014-10-22 16:57:52 +05:30
ankitjavalkarwork
14e1d20df3
Change position of 'To Time' field for better UX
2014-10-22 16:55:29 +05:30
Nabin Hait
f5b94143dc
Minor fixes
2014-10-22 16:14:41 +05:30
Neil Trini Lasrado
0683fc33ed
Fix error in get_default_cost_center() function
2014-10-22 14:51:37 +05:30
Pratik Vyas
da8a02d56e
Merge branch 'develop'
2014-10-22 14:19:17 +05:30
Pratik Vyas
16343683d9
bumped to version 4.9.0
2014-10-22 14:49:17 +06:00
Nabin Hait
2bdc017aff
Merge pull request #2339 from nabinhait/fix1
...
Minor fixes
2014-10-22 13:11:21 +05:30
Nabin Hait
16e05c321c
Removed stock ageing grid report
2014-10-22 13:10:43 +05:30
Nabin Hait
23d7919865
Stock ageing report fix
2014-10-22 13:06:26 +05:30
Nabin Hait
38265efc39
Minor fix
2014-10-21 20:23:39 +05:30
Rushabh Mehta
3daa49ac1f
[shopping-cart] i'm back
2014-10-21 16:16:30 +05:30
Rushabh Mehta
39dbf73de7
[merge] item-variants
2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35
Merge pull request #2231 from rmehta/item-variants
...
Item variants
2014-10-21 12:38:16 +05:30
Neil Trini Lasrado
572ad4c8ef
Error fix, arguments in function call for Make Payment Entry from SI/PI
2014-10-21 12:34:07 +05:30
Rushabh Mehta
2d414706dc
[hotfix] translation boo boo
2014-10-21 11:49:40 +05:30
Rushabh Mehta
d85e4b0d46
Merge pull request #2331 from rmehta/translation
...
[translations] update
2014-10-20 17:12:22 +05:30
Rushabh Mehta
45d03af8f6
[translations] update
2014-10-20 17:11:06 +05:30
Pratik Vyas
8668081b37
add my_config patch to travis
2014-10-20 17:04:22 +05:30
Nabin Hait
90fb64f7e8
Merge pull request #2303 from neilLasrado/fiscal-year-auto-create
...
Fiscal year auto create
2014-10-20 11:58:21 +05:30
Nabin Hait
73a3a2a131
Merge pull request #2327 from nabinhait/stock_reco
...
Fixes in credit note and quotation
2014-10-20 11:51:01 +05:30
Nabin Hait
73804580d4
validate quotation to lead or customer
2014-10-20 11:18:11 +05:30
Nabin Hait
259f9779db
Credit Note: Set total amount and print format fix
2014-10-20 11:18:11 +05:30
Neil Trini Lasrado
1cdfbdb899
fiscal year auto-create added
2014-10-17 15:44:22 +05:30
Pratik Vyas
14e0e58a7d
Merge branch 'develop'
2014-10-17 15:04:05 +05:30
Pratik Vyas
5eb373f7b5
bumped to version 4.8.0
2014-10-17 15:34:05 +06:00
Nabin Hait
4595c30a7b
Merge pull request #2322 from nabinhait/stock_reco
...
Partial payment reconciliation
2014-10-17 15:01:13 +05:30
Nabin Hait
fc2dd44694
Partial payment reconciliation. Fixes #1982
2014-10-17 14:57:20 +05:30
Pratik Vyas
053c54017e
[minor] add admin password to travis test site
2014-10-17 14:16:10 +05:30
Pratik Vyas
af473d78f2
Merge branch 'develop'
2014-10-15 15:34:39 +05:30
Pratik Vyas
26d096aa87
bumped to version 4.7.2
2014-10-15 16:04:39 +06:00
Nabin Hait
476c613ba6
Merge pull request #2317 from nabinhait/stock_reco
...
repost stock utility
2014-10-15 15:33:50 +05:30
Nabin Hait
2348a5f592
repost stock utility
2014-10-15 15:31:33 +05:30
Pratik Vyas
9d8d045c66
Merge branch 'develop'
2014-10-15 14:44:35 +05:30
Pratik Vyas
63914dd55b
bumped to version 4.7.1
2014-10-15 15:14:35 +06:00
Nabin Hait
93a8042f08
Merge pull request #2316 from nabinhait/stock_reco
...
Minor fix
2014-10-15 14:44:06 +05:30
Nabin Hait
b2f32dac1b
Minor fix
2014-10-15 14:42:18 +05:30
Pratik Vyas
577a3acaac
Merge branch 'develop'
2014-10-15 14:35:47 +05:30
Pratik Vyas
5e46ce8a50
bumped to version 4.7.0
2014-10-15 15:05:47 +06:00
Nabin Hait
3b7342b7b5
Merge pull request #2315 from nabinhait/stock_reco
...
Strip company in setup wizard
2014-10-15 13:59:07 +05:30
Nabin Hait
531077e504
Strip company in setup wizard
2014-10-15 13:55:37 +05:30
Nabin Hait
147918ed66
Merge pull request #2313 from nabinhait/stock_reco
...
Fix gl entries for stock transactions
2014-10-15 12:44:59 +05:30
Nabin Hait
9bbfca9226
Fix gl entries for stock transactions
2014-10-15 12:24:38 +05:30
Nabin Hait
f1a07ff105
Allow zero rate while reposting
2014-10-15 12:23:35 +05:30
Nabin Hait
fb6e434315
Guess valuation rate in case of negative stock
2014-10-15 11:34:40 +05:30
Rushabh Mehta
3811d96feb
Merge pull request #2308 from devdesco-ceo/patch-1
...
Update README.md
2014-10-15 10:02:06 +05:30
Viktor Zhuromskyy
1017615d02
Update README.md
2014-10-14 10:12:10 -05:00
Pratik Vyas
056d627f46
Merge branch 'develop'
2014-10-14 17:34:01 +05:30
Pratik Vyas
663bfeacf4
bumped to version 4.6.2
2014-10-14 18:04:01 +06:00
Nabin Hait
e918ebd721
Merge pull request #2307 from nabinhait/stock_reco
...
Minor fixes
2014-10-14 17:16:32 +05:30
Nabin Hait
0dc18f0102
Minor fixes
2014-10-14 17:15:02 +05:30
Pratik Vyas
8ddc882a66
Merge branch 'develop'
2014-10-14 16:16:29 +05:30
Pratik Vyas
49365d0982
bumped to version 4.6.1
2014-10-14 16:46:29 +06:00
Nabin Hait
50c29c7d0f
Merge pull request #2306 from nabinhait/stock_reco
...
Negative stock in perpetual inventory
2014-10-14 16:10:46 +05:30
Nabin Hait
bf492122f8
minor fix
2014-10-14 16:09:14 +05:30
Nabin Hait
38d0ed9f3a
Negative stock allowed for perpetual inventory. Blocked in specific case
2014-10-14 16:08:19 +05:30
Pratik Vyas
248a65b37d
Merge branch 'develop'
2014-10-14 12:37:07 +05:30
Pratik Vyas
78f86e9385
bumped to version 4.6.0
2014-10-14 13:07:07 +06:00
Nabin Hait
d9f3e0c275
Merge pull request #2297 from neilLasrado/bom-issue
...
Fix - BOM calculated wrong cost on update cost
2014-10-14 12:28:16 +05:30
Neil Trini Lasrado
c40451ee2e
Patch Fixed
2014-10-14 12:14:39 +05:30
Neil Trini Lasrado
6644406185
Fix - BOM calculated wrong cost on update cost
2014-10-14 12:14:38 +05:30
Nabin Hait
b3a962e121
Merge pull request #2304 from nabinhait/stock_reco
...
Repost gl entries where mismatch with stock balance
2014-10-14 11:58:41 +05:30
Nabin Hait
8a28ccfa2f
Repost gl entries where mismatch with stock balance
2014-10-14 11:41:56 +05:30
Nabin Hait
0a75fa09ef
Merge pull request #2300 from nabinhait/stock_reco
...
Minor fixes
2014-10-13 11:52:00 +05:30
Nabin Hait
17a16eeaf4
Tets case fixed for payment tool
2014-10-13 11:43:14 +05:30
Nabin Hait
3d3f0bcf54
Minor fix in setup wizard
2014-10-13 11:32:41 +05:30
Nabin Hait
bc8b20ae3c
Allocate entire advance amount if advance against SO/PO
2014-10-13 10:48:26 +05:30
Nabin Hait
daf344e5fd
Precision fixed in batch-wise balance report
2014-10-13 10:48:26 +05:30
Pratik Vyas
7916792f99
Merge pull request #2298 from pdvyas/fix-mariadb
...
add my_config patch to travis
2014-10-12 19:39:52 +05:30
Pratik Vyas
27e37e68b2
add my_config patch to travis
2014-10-12 19:35:46 +05:30
Nabin Hait
a538f8a24a
Merge pull request #2296 from nabinhait/stock_reco
...
Stock balance report and valuation fixes
2014-10-10 21:23:30 +05:30
Nabin Hait
70ec88b733
fixed test cases
2014-10-10 21:22:46 +05:30
Nabin Hait
4f0e5db216
Stock balance grid report deprecated and moved to server side
2014-10-10 20:54:57 +05:30
Nabin Hait
79ed124939
Update journal_voucher.py
2014-10-10 18:19:03 +05:30
Nabin Hait
c0a3cd603b
Merge pull request #2290 from ankitjavalkarwork/accreport
...
Bug Fixes
2014-10-10 18:11:36 +05:30
Nabin Hait
30a0e3e8b4
Merge pull request #2275 from ankitjavalkarwork/fix2164
...
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
2014-10-10 18:05:19 +05:30
Nabin Hait
7c6f990cf9
Minor fix for moving average
2014-10-10 18:03:27 +05:30
Nabin Hait
7820b171d3
Stock balance grid report deprecated and moved to server side
2014-10-10 18:03:07 +05:30
ankitjavalkarwork
ad3d698fd8
[ #2164 ] Add test case for delivered qty in Sales Order
2014-10-10 16:59:47 +05:30
ankitjavalkarwork
0cf4cc283c
Add Shipping Addr to Sales Invoice
2014-10-10 16:55:03 +05:30
ankitjavalkarwork
9a4b173b88
Add validation for stopped orders, advance payment in journal voucher
2014-10-10 16:28:41 +05:30
Nabin Hait
a5082d6233
Merge pull request #2283 from neilLasrado/employee-reports-to
...
employee cannot report to himself validation added to employee doctype
2014-10-10 15:20:13 +05:30
Nabin Hait
4972a3fb2e
Merge pull request #2252 from neilLasrado/fiscal-year-v5
...
Fiscal year autofetch added
2014-10-10 15:07:22 +05:30
ankitjavalkarwork
6d83454237
Disallow Stopped Orders in Against Voucher table
2014-10-10 13:30:10 +05:30
ankitjavalkarwork
ff231b5e62
Allow advance JV payments in Accounts Receivable/Payable
2014-10-10 13:13:39 +05:30
Nabin Hait
4d74216147
Maintain negative stock balance if balance qty is negative
2014-10-09 19:25:19 +05:30
ankitjavalkarwork
e69a611991
[ #2164 ] New field names in DN, fix field name refs, Patch added
2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d
[ #2164 ] Add Delivered Qty to Sales Inv from Delivery Note, fix issues
2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
9b08062bed
employee cannot report to himself validation added to employee doctype
2014-10-09 17:26:17 +05:30
Neil Trini Lasrado
eaae58f507
Transaction.js fixed , code commonified
2014-10-09 15:01:13 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6
Fixed issues
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5
Fiscal year autofetch added
2014-10-09 15:01:12 +05:30
Nabin Hait
ce89c2f192
Merge pull request #2281 from ankitjavalkarwork/fix1450
...
[fix][#1450 ] Add Shipping Addr field to Sales Invoice
2014-10-09 14:40:07 +05:30
ankitjavalkarwork
e93b1fc508
[fix][ #1450 ] Add Shipping Addr field to Sales Invoice
2014-10-09 12:11:49 +05:30
Nabin Hait
b7e5ad0a31
Merge pull request #2276 from ankitjavalkarwork/sopofield
...
Rearrange To/From, Recurring Type field for better UX
2014-10-09 11:58:13 +05:30
Nabin Hait
0ba32b05be
Merge pull request #2266 from ankitjavalkarwork/fix1387
...
Add Customer Credit Balance Report
2014-10-09 11:45:26 +05:30
Nabin Hait
12ade3c682
Merge pull request #2250 from ankitjavalkarwork/fix1808
...
[fix][#1808 ] Allow configurable AR/AP ageing dates
2014-10-09 11:24:01 +05:30
Pratik Vyas
e435592d64
[minor] Fix default website style patch (reload doc)
2014-10-09 11:22:12 +05:30
Nabin Hait
7ddde8dc3a
Merge pull request #2278 from nabinhait/stock_reco
...
stock reco and repost vouchers
2014-10-08 18:38:54 +05:30
Nabin Hait
fce2881de6
minor fix
2014-10-08 18:38:27 +05:30
Nabin Hait
e96e83d557
stock reco and repost vouchers
2014-10-08 18:06:14 +05:30
ankitjavalkarwork
1b2944e871
Rearrange To/From, Recurring Type field for better UX
2014-10-08 14:24:58 +05:30
Rushabh Mehta
074e73a0dd
[translations] updated via translator
2014-10-08 14:16:33 +05:30
Rushabh Mehta
ebc6016ffb
[tests] fixes
2014-10-08 13:54:19 +05:30
Nabin Hait
8923801881
Update stock_entry.py
2014-10-08 13:20:31 +05:30
Rushabh Mehta
7472a1147c
[tests] fixes
2014-10-08 12:41:06 +05:30
Rushabh Mehta
c2d2857540
[fixes] tests and moved reorder_item to separate module
2014-10-08 12:19:55 +05:30
Rushabh Mehta
58a5de5237
Merge pull request #2272 from ankitjavalkarwork/fix1769
...
[fix][#1769 ] Add disable option to Sales/Purchase Tax Master with validation
2014-10-08 12:14:16 +05:30
Rushabh Mehta
f850987db0
[fixes] tests and moved reorder_item to separate module
2014-10-08 12:03:19 +05:30
Nabin Hait
cfafe93391
Merge pull request #2274 from nabinhait/stock_reco
...
Stock reco
2014-10-08 11:03:03 +05:30
Nabin Hait
6c48ef781b
Utility: Repost stock ledger entries and gl entries for all stock transactions
2014-10-08 11:02:18 +05:30
Nabin Hait
adeb976a1b
Block negative stock in perpetual inventory
2014-10-08 11:02:18 +05:30
Nabin Hait
bb19b91ef9
stock reco fixes
2014-10-08 11:02:18 +05:30
Nabin Hait
bfa7f171bd
Stock reconciliation sl entries
2014-10-08 11:02:18 +05:30
Nabin Hait
b96c014daf
Stock Reconciliation logic simplified
2014-10-08 11:02:18 +05:30
Rushabh Mehta
c62b6a815b
[tests] fixes to stock entry
2014-10-07 17:15:30 +05:30
Pratik Vyas
e0c83e22d9
Merge branch 'develop'
2014-10-07 17:05:32 +05:30
pdvyas
099ad0f5e1
bumped to version 4.5.2
2014-10-07 17:35:32 +06:00
Rushabh Mehta
b31e90c7a5
[tests] fixes to stock entry
2014-10-07 16:56:46 +05:30
Rushabh Mehta
db08041f05
[fix] remove test for item attribute value
2014-10-07 15:39:35 +05:30
Rushabh Mehta
724f9e57e3
[item-variants] get table values from template if not set in variant #2224
2014-10-07 15:29:58 +05:30
ankitjavalkarwork
6c29d8789a
[fix][ #1769 ] Add disable option to Sales/Purchase Tax Master with validation
2014-10-07 14:44:37 +05:30
Nabin Hait
803cd11f68
Update patches.txt
2014-10-07 13:05:29 +05:30
Rushabh Mehta
baef96b5a2
[item-variants] allow production order of variant #2224
2014-10-07 12:34:19 +05:30
ankitjavalkarwork
fe7a6b502a
Add Customer Credit Balance Report, minor changes
2014-10-07 11:41:31 +05:30
Rushabh Mehta
1a7637459c
[item-variants] added more validations, tests #2224
2014-10-07 11:40:47 +05:30
Rushabh Mehta
ef276045c4
[item variants] make variants, bom updates
2014-10-07 11:40:47 +05:30
Rushabh Mehta
70aa8933b1
[item variant] started
2014-10-07 11:39:54 +05:30
Nabin Hait
852e3600cd
Merge pull request #2271 from nabinhait/coa
...
party model patch included in patches.txt
2014-10-07 11:39:41 +05:30
Nabin Hait
0ef1e75c56
party model patch included in patches.txt
2014-10-07 11:37:58 +05:30
Nabin Hait
cf9746dd84
Merge pull request #2270 from nabinhait/fix2
...
Voucher dynamic link in general ledger report
2014-10-07 11:33:40 +05:30
Nabin Hait
b70712dbba
Voucher dynamic link in general ledger report
2014-10-07 11:32:54 +05:30
ankitjavalkarwork
437af5b031
[fix][ #1808 ] Allow configurable AR/AP ageing dates
2014-10-07 11:32:21 +05:30
Rushabh Mehta
4c057fe693
Merge pull request #2269 from rmehta/fixes
...
[fix] packing slip
2014-10-07 11:06:08 +05:30
Nabin Hait
ee8ff51d60
Merge pull request #2261 from ankitjavalkarwork/sopofield
...
[#2253 ] Rearrange To/From fields and depend on is_recurring
2014-10-07 10:52:10 +05:30
Rushabh Mehta
9974b16c32
[fix] packing slip
2014-10-07 10:52:05 +05:30
Nabin Hait
f065b756e5
Update customer.json
2014-10-06 17:50:58 +05:30
Nabin Hait
dbe8dd843e
Merge pull request #2205 from nabinhait/coa
...
Country-wise chart of accounts and party model
2014-10-06 14:08:36 +05:30
Nabin Hait
2dcc576f0e
Chart finalizzed for Austria and UAE
2014-10-06 13:15:21 +05:30
Nabin Hait
6f17cf93c5
Party balance
2014-10-06 13:15:21 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
678b441082
Payment tool as per party model
2014-10-06 13:15:02 +05:30
Nabin Hait
36cf4a4708
Test case fixes
2014-10-06 13:15:02 +05:30
Nabin Hait
034ac6b00b
Payment Reconciliation based on party
2014-10-06 13:14:22 +05:30
Nabin Hait
894a1b539a
Dynamic link in general ledger and stock ledger report
2014-10-06 13:14:22 +05:30
Nabin Hait
cb8e255f0f
Dynamic link for voucher no in AR/AP report
2014-10-06 13:14:22 +05:30
Nabin Hait
bd1c8aff8e
Deleted customer/supplier account head report
2014-10-06 13:14:02 +05:30
Nabin Hait
76030540cb
Accounts Receivable/Payable report based on party
2014-10-06 13:14:02 +05:30
Nabin Hait
965a5a34b5
Party is now dynamic link in JV and GL Entry
2014-10-06 13:13:28 +05:30
Nabin Hait
62c762aac5
Sales/purchase register and item-wise sales/purchase register fixes for party
...
Show Delivery Note and Purchase Receipt based on SO and PO if it not defined in SI/PI #2166
2014-10-06 13:13:27 +05:30
Nabin Hait
8f44f03cba
Party model patch
...
- Create receivable / payable account, set them in company
- Set party in JV and GL Entry
- Delete all exisintg individual party account
2014-10-06 13:13:27 +05:30
Nabin Hait
db030d1761
Set Receivable/Payable account based on party
2014-10-06 13:13:27 +05:30
Nabin Hait
e2095c0dd7
Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type
...
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
2014-10-06 13:12:05 +05:30
Nabin Hait
3225102eb9
Update outstanding amt based on party
...
Party mandatory if account is receivable/payable
Fetch advance based on party
Reconciliation splitting logic based on party
2014-10-06 13:09:18 +05:30
Nabin Hait
cc582bd774
posted party in gl entry and multiple other fixes
2014-10-06 13:06:11 +05:30
Nabin Hait
3a40435f8c
Credit days and credit limit option in customer group / supplier type #1354
2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f
Credit Limit and credit days fixes #2031
2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
Nabin Hait
fbc3d25d13
Root type defined for uae and austria
2014-10-06 13:01:58 +05:30
Nabin Hait
9ddc002d6a
country wise chart of accounts restructured
2014-10-06 13:01:58 +05:30
Nabin Hait
712aa5809d
Minor changes in import-from-odoo
2014-10-06 13:01:57 +05:30
ankitjavalkarwork
9e5f319d80
[ #2253 ] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO
2014-10-06 12:58:38 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Rushabh Mehta
214164cc38
Merge pull request #2251 from ssiegel/fix-opportunity
...
Fix opportunities not showing in "Linked With" dialog
2014-10-04 08:50:27 +05:30
Stefan Siegel
76a8c75592
Fix opportunities not showing in "Linked With" dialog
2014-10-03 13:25:42 +02:00
Nabin Hait
52527d2fe6
Merge pull request #2249 from ankitjavalkarwork/fix1840
...
[fix][minor] Set Project Gantt Chart dates same as Project dates
2014-10-03 12:53:58 +05:30
Nabin Hait
ce750870f8
Merge pull request #2245 from ankitjavalkarwork/fix2215
...
[fix][minor]Add Actual Qty, Projected Qty to Ordered Items to be Delivered Report
2014-10-03 12:52:12 +05:30
ankitjavalkarwork
6388c18b07
[fix][minor] Set Project Gantt Chart dates same as Project dates
2014-10-02 17:02:48 +05:30
ankitjavalkarwork
e9877a0c48
[fix][minor]Add Actual Qty, Projected Qty to Ordered Items to be Delivered Report
2014-10-01 18:07:25 +05:30
Nabin Hait
4f614b4030
Merge pull request #2195 from neilLasrado/manufacture-and-repack
...
[fix] Issue #2183 - Manufacturing and repack seprated in stock entry
2014-09-30 15:11:05 +05:30
Nabin Hait
3d458e973e
Merge pull request #2236 from neilLasrado/upstream/develop
...
Has Batch No field should be freezed #2023
2014-09-30 14:56:15 +05:30
Nabin Hait
c1a1548130
Merge pull request #2233 from ankitjavalkarwork/fix1004
...
[fix] Merge permission roles to modify frozen entries/set frozen accounts
2014-09-30 14:52:29 +05:30
Neil Trini Lasrado
3a19a71262
patch fixed
2014-09-30 14:48:38 +05:30
Neil Trini Lasrado
29d1a1c593
manufacturing and repack sepreted, test cases fixed, patch fixed
2014-09-30 14:07:56 +05:30
Neil Trini Lasrado
3b90de558f
Has Batch No field should be freezed #2023
2014-09-30 12:57:32 +05:30
ankitjavalkarwork
44d42ddf63
[fix] Merge permission roles to modify frozen entries/set frozen accounts
2014-09-30 10:40:39 +05:30
Nabin Hait
af7e31acb3
Merge pull request #2235 from adityaduggal/develop
...
Added the dynamic link field in the accounts receivable report.
2014-09-30 10:39:40 +05:30
Aditya Duggal
a2c9d35efb
Added the dynamic link field.
2014-09-29 17:44:28 +05:30
Aditya Duggal
4c058f4056
Added the dynamic link and removed the link column
2014-09-29 17:41:19 +05:30
Pratik Vyas
ad67b84d43
Merge branch 'develop'
2014-09-29 15:40:04 +05:30
Pratik Vyas
4e81e4065b
bumped to version 4.5.1
2014-09-29 16:10:04 +06:00
Nabin Hait
81332789cb
Merge pull request #2232 from nabinhait/hotfix
...
Fix gl entries for stock transactions
2014-09-29 15:25:02 +05:30
Nabin Hait
82d7c0c9eb
Patch: Fix gl entries for stock transactions
2014-09-29 15:07:51 +05:30
Rushabh Mehta
86211cd219
Merge pull request #2203 from rmehta/mailbox
...
Mailbox
2014-09-29 14:18:10 +05:30
Rushabh Mehta
e1446eb516
[fix] quotation status
2014-09-29 14:09:50 +05:30
Rushabh Mehta
20fa996dfa
[fix] quotation status
2014-09-29 13:58:40 +05:30
Rushabh Mehta
39764685f0
[fix] material request feed
2014-09-29 13:00:36 +05:30
Rushabh Mehta
e1509162e1
[fix] material request feed
2014-09-29 12:53:53 +05:30
Rushabh Mehta
3ef0b7ce99
[fix] support ticket feed
2014-09-29 12:48:31 +05:30
Rushabh Mehta
66e08e39f7
[fix] currency moved to frappe
2014-09-29 12:17:03 +05:30
Rushabh Mehta
1c91868755
[version] 5.0.0-alpha
2014-09-29 12:09:55 +05:30
Rushabh Mehta
96c52c38e0
[travis] checkout v5.0 of frappe
2014-09-29 11:44:22 +05:30
Nabin Hait
d60235e239
minor fix in warehouse-wise stock balance report
2014-09-29 11:36:06 +05:30
Nabin Hait
9b50b0a762
Fixes for item list view
2014-09-29 11:36:06 +05:30
Pratik Vyas
21e14c4c98
Merge branch 'develop'
2014-09-26 16:49:59 +05:30
Pratik Vyas
16edacebc7
bumped to version 4.5.0
2014-09-26 17:19:59 +06:00
Nabin Hait
5e080f9039
Update utils.py
2014-09-26 15:05:30 +05:30
Nabin Hait
81959cc8eb
Merge pull request #2213 from ankitjavalkarwork/grossprofitrep
...
Add ability to fetch Non stock items in Gross Profit report
2014-09-26 15:03:09 +05:30
Nabin Hait
75027b4d54
Merge pull request #2225 from nabinhait/hotfix
...
GL Entries for future stock voucher and multiple minor fixes
2014-09-26 14:48:56 +05:30
Nabin Hait
b0bd99266d
Fix in landed cost voucher
2014-09-26 14:30:02 +05:30
Nabin Hait
b9e04815f8
Repost gl entries for future stock vouchers
2014-09-26 14:24:42 +05:30
Nabin Hait
18ccc27b1b
Minor fix in naming naming series
2014-09-26 14:23:00 +05:30
Nabin Hait
95f1fe92e2
Maintenance visit search field issue fixed
2014-09-26 14:23:00 +05:30
Nabin Hait
b783f519ee
Fixes in sales/purchase invoice trends report
2014-09-26 14:23:00 +05:30
Nabin Hait
996a1010cb
Moved Installation note from tools to documents section
2014-09-26 14:23:00 +05:30
Anand Doshi
32a9dfd983
Merge branch 'sbkolate-develop' into develop
2014-09-22 13:19:24 +05:30
Anand Doshi
1394509343
Fixes for recurring document
2014-09-21 19:45:49 +05:30
Pratik Vyas
0f31c36b2c
Merge branch 'develop'
2014-09-19 14:46:07 +05:30
Pratik Vyas
14ac8f71b7
bumped to version 4.4.2
2014-09-19 15:16:07 +06:00
Nabin Hait
6a92d51383
Merge pull request #2212 from nabinhait/hotfix
...
Fetch and validate advance entries in sales/purchase invoice
2014-09-19 14:41:20 +05:30
Nabin Hait
7c831c3fe5
Get advance in sales/purchase invoice
2014-09-19 14:31:49 +05:30
Nabin Hait
778ff463af
Minor fix in authorization control
2014-09-19 11:39:47 +05:30
Nabin Hait
70a31d5402
Gantt view fix for translations
2014-09-19 11:18:10 +05:30
ankitjavalkarwork
9aa11d2ad7
Add ability to fetch Non stock items in Gross Profit report
2014-09-18 19:08:04 +05:30
Nabin Hait
48f5fa69f3
Fetch and validate advance entries in sales/purchase invoice
2014-09-18 15:04:11 +05:30
Pratik Vyas
83a2d12cd2
Merge branch 'develop'
2014-09-18 14:19:15 +05:30
Pratik Vyas
e539297e53
bumped to version 4.4.1
2014-09-18 14:49:14 +06:00
Nabin Hait
bbc3d015a3
Update authorization_control.py
2014-09-18 14:09:20 +05:30
Nabin Hait
e4475c635d
Merge pull request #2211 from nabinhait/hotfix
...
Escaped single quote in authorization control queries
2014-09-18 13:01:33 +05:30
Anand Doshi
8370cb3e71
Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop
2014-09-18 12:06:05 +05:30
Nabin Hait
4073880ecf
Escaped single quote in authorization control queries
2014-09-18 11:01:26 +05:30
Rushabh Mehta
c786802124
[communication] covert-wip
2014-09-17 17:28:03 +05:30
Nabin Hait
763c7a56dc
Merge pull request #2209 from nabinhait/hotfix
...
Minor fix in gross profit report
2014-09-17 14:02:51 +05:30
Nabin Hait
556fbc487d
Minor fix in gross profit report
2014-09-17 12:13:44 +05:30
Pratik Vyas
54938d431c
Merge branch 'develop'
2014-09-16 15:58:28 +05:30
Pratik Vyas
31c61e7eae
bumped to version 4.4.0
2014-09-16 16:28:28 +06:00
Anand Doshi
a23151b138
Merge pull request #2202 from 81552433qqcom/develop
...
hotfix for project wise report and translation.
2014-09-16 15:23:34 +05:30
Anand Doshi
11b75759d2
Merge pull request #2194 from ankitjavalkarwork/stockbalreport
...
Update report with Valuation rate, stock values, move to Main report
2014-09-16 15:22:25 +05:30
Rushabh Mehta
a2c562fea4
Update CONTRIBUTING.md
2014-09-16 15:21:43 +05:30
Anand Doshi
8950abc36f
Merge pull request #2197 from anandpdoshi/anand-september-15
...
[minor] removed Suggest
2014-09-16 15:18:57 +05:30
Anand Doshi
27c7226d97
Merge pull request #2201 from nabinhait/hotfix
...
Columns added in report and fixes in customer's account creation
2014-09-16 15:18:31 +05:30
Rushabh Mehta
bf8715dba4
[refactor] used frappe.sendmail
2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
7fb79f6062
#2092
2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0
[cleanup] removed communication js, fields
2014-09-16 15:11:42 +05:30
Rushabh Mehta
7b128dc15b
[refactor] remove Home module
2014-09-16 15:10:54 +05:30
Rushabh Mehta
9786faa862
[refactor] hooks.py fixes
2014-09-16 15:10:54 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
81552433qqcom
1db294e837
hotfix for project wise report
...
translation patch for email digest and support ticket.
2014-09-16 16:49:58 +08:00
Nabin Hait
16e943f120
Removed link of item-wise last purchase rate from buying home page
2014-09-16 12:57:31 +05:30
Nabin Hait
9d610214cf
Strip party name before checking for account
2014-09-16 12:28:40 +05:30
Nabin Hait
c25681c36c
Added item group and brand in sales-person-wise transaction summary report
2014-09-16 12:28:40 +05:30
Nabin Hait
1aea75261d
Merge pull request #2200 from nabinhait/hotfix
...
Minor fix
2014-09-16 11:28:15 +05:30
Nabin Hait
5cd20e3d24
Minor fix
2014-09-16 11:26:53 +05:30
Nabin Hait
9968c7ef70
Merge pull request #2199 from nabinhait/hotfix
...
Minor fix
2014-09-16 11:25:06 +05:30
Nabin Hait
ca260618d8
Minor fix
2014-09-16 11:24:25 +05:30
Anand Doshi
30c5b41398
[minor] removed Suggest
2014-09-15 16:43:34 +05:30
Sambhaji Kolate
f37d4337a4
fix test for purchase order
2014-09-15 13:37:46 +05:30
Anand Doshi
93c2adb2cd
Merge pull request #2193 from anandpdoshi/anand-september-15
...
Recurring fix, cherry-picked nabin's address template fix
2014-09-15 13:04:12 +05:30
Sambhaji Kolate
525ab0a925
fix build
2014-09-15 12:57:58 +05:30
Anand Doshi
a92c6886cd
Merge pull request #2173 from ankitjavalkarwork/fix2043
...
Add message on cancel in SI if C-Form exists, fix minor error, Add validation in C-Form
2014-09-15 12:56:51 +05:30
Anand Doshi
01d171756b
[fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation
2014-09-15 12:50:37 +05:30
Sambhaji Kolate
930e7f5578
fix conflict
2014-09-15 12:43:48 +05:30
Sambhaji Kolate
d14e15d432
fix conflict
2014-09-15 12:31:44 +05:30
Sambhaji Kolate
4d3a18890b
fix conflict
2014-09-15 12:20:11 +05:30
Nabin Hait
65bef02607
Fixes in address template
2014-09-15 12:18:28 +05:30
Rushabh Mehta
cb9331ddca
Merge pull request #2191 from 81552433qqcom/develop
...
#2190 hotfix, item page
2014-09-15 10:13:09 +05:30
81552433qqcom
ac0c3fb696
#2190 hotfix, item page
2014-09-15 10:21:36 +08:00
Anand Doshi
a844fb78bb
Merge branch '81552433qqcom-master' into develop
2014-09-12 16:23:08 +05:30
81552433qqcom
6d02939256
changed indent. as well use tab instead of space.
2014-09-12 16:22:28 +05:30
81552433qqcom
e3b63f2d9c
added __() for options that need label.
2014-09-12 16:07:12 +05:30
81552433qqcom
1c440b3b31
month options doesn't get translated.
2014-09-12 16:07:12 +05:30
81552433qqcom
c5a0ef8399
fix according to the suggestion.
2014-09-12 16:07:12 +05:30
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42
translations.
2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54
various translation missed __()
2014-09-12 16:07:11 +05:30
Anand Doshi
97478b746d
Merge pull request #2185 from anandpdoshi/ankit-payment-tool
...
Payment Tool
2014-09-12 15:53:03 +05:30
Anand Doshi
61a591944b
[minor] ui/ux fixes in Payment Tool
2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817
Payment Tool #2106
2014-09-12 15:23:46 +05:30
Anand Doshi
84e08fd534
Merge pull request #2174 from neilLasrado/cost-of-production-cycle-magix
...
Cost of Production cycle
2014-09-12 14:45:19 +05:30
Anand Doshi
b0e56fa1b5
Merge pull request #2181 from nabinhait/hotfix
...
Report print format fixed for translated columns
2014-09-12 14:18:52 +05:30
Neil Trini Lasrado
e7c48ed3b0
bom operation inList view fix
2014-09-12 12:08:02 +05:30
Nabin Hait
c432270ca8
Report print format fixed for translated columns
2014-09-12 12:00:47 +05:30
Neil Trini Lasrado
6a7f75c3e3
Cost of Production cycle
2014-09-12 11:25:03 +05:30
Neil Trini Lasrado
e9882e12ba
Cost of Production cycle
2014-09-12 11:25:03 +05:30
ankitjavalkarwork
3df10429db
Add message on cancel in SI if C-Form exists, Add validation in C-Form, remove update_c_form
2014-09-11 16:58:18 +05:30
Anand Doshi
eee569bb20
Merge pull request #2177 from anandpdoshi/anand-september-11
...
[fix] transfer_qty in get_stock_and_rate
2014-09-11 16:47:59 +05:30
ankitjavalkarwork
2e07305616
Update report with Valuation rate, stock values, move to Main report
2014-09-11 16:47:19 +05:30
Anand Doshi
2f9c36a588
Merge pull request #2175 from ankitjavalkarwork/fix2153
...
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-11 16:47:08 +05:30
Anand Doshi
907494c5d4
[fix] transfer_qty in get_stock_and_rate
2014-09-11 16:22:12 +05:30
Sambhaji Kolate
b14401c320
change convert_to_recurring() to take recurring_id dynamicaly
2014-09-11 16:09:05 +05:30
Anand Doshi
4d2520ea53
Merge pull request #2176 from nabinhait/hotfix
...
Opening entry should not be considered in bank reconciliation statement
2014-09-11 15:21:24 +05:30
Nabin Hait
cece0c7ffe
Opening entry should not be considered in bank reconciliation statement
2014-09-11 13:59:00 +05:30
ankitjavalkarwork
5e34383e25
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-10 17:54:42 +05:30
Sambhaji Kolate
b2a3f2d386
some minor changes get fixed for PO/PI
2014-09-10 17:40:48 +05:30
Anand Doshi
8e39ee79b0
Merge pull request #2167 from anandpdoshi/anand-september-9
...
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-10 15:24:52 +05:30
Sambhaji Kolate
6b679c45df
Updated purchase_invoice.json and purchase_order.json with some missed out changes
2014-09-10 13:57:45 +05:30
Sambhaji Kolate
e3d2643f2b
Changes for Recurring PO/PI
2014-09-10 13:07:59 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Pratik Vyas
6e566fb154
Merge branch 'develop'
2014-09-09 15:10:47 +05:30
Pratik Vyas
6675ce9036
bumped to version 4.3.0
2014-09-09 15:40:47 +06:00
Pratik Vyas
2cf75fcca2
change version in hooks.py
2014-09-09 15:10:18 +05:30
Anand Doshi
941f698daf
Merge pull request #2165 from anandpdoshi/anand-september-9
...
Fix in web clear cache for Item, cheque printing format
2014-09-09 13:59:39 +05:30
Anand Doshi
48b3d1383f
[minor] Cheque Printing Format
2014-09-09 12:59:16 +05:30
Anand Doshi
dc79334f1c
[fix] Clear website cache for Item Group on saving Item
2014-09-09 12:35:15 +05:30
Anand Doshi
ab74a502e2
Merge pull request #2162 from nabinhait/hotfix
...
Get items in PO from material requests based on supplier
2014-09-09 12:07:27 +05:30
Nabin Hait
fa18e7c21f
Merge pull request #2140 from nathando/patch-1
...
get_item_list does not [item qty=0]
2014-09-09 12:06:21 +05:30
Nabin Hait
ff7e9b6b22
Get items in PO from material requests based on supplier
2014-09-09 11:01:55 +05:30
Rushabh Mehta
00e93d1c1d
Merge pull request #2159 from anandpdoshi/anand-september-8
...
[minor] Set in_list_view for Sales and Purchase item tables
2014-09-09 09:21:04 +05:30
Anand Doshi
45c9b1c065
[minor] Set in_list_view for Sales and Purchase item tables
2014-09-08 17:42:17 +05:30
Anand Doshi
dcfcd693c2
Merge pull request #2158 from rmehta/translated
...
transations-08-sep-2014
2014-09-08 15:30:15 +05:30
RM
7ab4ee1d79
transations-08-sep-2014
2014-09-08 09:28:34 +00:00
Nabin Hait
c017ed251d
Merge pull request #2151 from ankitjavalkarwork/fix1999
...
Allow renaming for Sales Partner Doctype
2014-09-08 14:23:17 +05:30
Nabin Hait
34b94aff73
Merge pull request #2154 from anandpdoshi/anand-september-5
...
Setup Wizard: set corrected number format in system settings
2014-09-08 14:23:07 +05:30
Anand Doshi
65a5f85af5
Setup Wizard: set corrected number format in system settings
2014-09-05 17:27:25 +05:30
Anand Doshi
52a39a00d5
Merge pull request #2149 from anandpdoshi/anand-september-5
...
[fix] Validate Expense Approver
2014-09-05 15:24:24 +05:30
ankitjavalkarwork
ce9a9eeecc
Allow renaming for Sales Partner Doctype
2014-09-05 14:58:21 +05:30
Nabin Hait
cbd433603d
Merge pull request #2150 from nabinhait/hotfix
...
minor fixes
2014-09-05 14:57:02 +05:30
Nabin Hait
91fb661d12
minor fixes
2014-09-05 14:56:24 +05:30
Anand Doshi
0b74b6d98c
[fix] Validate Expense Approver
2014-09-05 14:41:53 +05:30
Anand Doshi
d42326bf43
[hotfix] hooks - recurring order
2014-09-05 11:20:29 +05:30
Anand Doshi
4c93f35c2b
Merge pull request #2145 from nabinhait/hotfix
...
Minor fixes
2014-09-04 15:38:00 +05:30
Nabin Hait
84f0cc6614
Dont show opening entries in Bank reconciliation
2014-09-04 15:21:46 +05:30
Nabin Hait
0f798dda15
Valuation rate for finished goods in repack entries
2014-09-04 15:21:46 +05:30
Nabin Hait
629e51a8e9
Search field fixed in stock entry
2014-09-04 15:21:46 +05:30
Anand Doshi
4211aa41a0
[hotfix] Product Search 'More' button
2014-09-04 15:16:13 +05:30
Anand Doshi
5893e143f4
Merge pull request #2143 from anandpdoshi/anand-septemper-3
...
[minor] id.csv
2014-09-04 15:00:41 +05:30
Anand Doshi
d91c4d3e00
[translations] German translations from a user
2014-09-03 21:39:05 +05:30
Anand Doshi
3d911eba6c
[minor] id.csv
2014-09-03 17:33:33 +05:30
Nabin Hait
0c8e4335f9
Merge pull request #2142 from nabinhait/hotfix
...
removed test records for landed cost voucher
2014-09-03 14:30:50 +05:30
nathando
247e9ffc96
get_item_list does not [item qty=0]
...
- By using `if not d.qty:` it totally limits the chance of creating an empty Delivery Note
- Should be changed to `if d.qty is None`
Use case for empty DN:
- Open a Delivery Note and tight to a specific Sales Order first without knowing the real qty at this point.
- Using barcode scanner to receive Sales Order to this DN (multiple times).
2014-09-03 15:03:31 +08:00
Pratik Vyas
3f4c3086df
Remove frappe version pinning in requirements.txt
2014-09-03 10:35:13 +05:30
Nabin Hait
a84f3663dd
removed test records for landed cost voucher
2014-09-02 23:11:06 +05:30
Nabin Hait
714b3ef7f8
Merge pull request #2139 from nabinhait/hotfix
...
Repost stock reconciliation and valuation rate in repack entry
2014-09-02 20:06:28 +05:30
Nabin Hait
96bdc5834c
Get valuation rate in manufacturing/repack entry
2014-09-02 20:02:25 +05:30
Nabin Hait
3f4885e342
repost stock reconciliation
2014-09-02 20:02:24 +05:30
Nabin Hait
ee2bc92ab2
Merge pull request #2134 from nabinhait/hotfix
...
Stock reconciliation fixes
2014-09-02 20:01:57 +05:30
Pratik Vyas
144f06e381
Update patches.txt
2014-09-01 18:31:11 +05:30
Nabin Hait
7f3f2a0f0a
Fixes in repost_stock utility
2014-09-01 18:16:24 +05:30
Nabin Hait
9e563e7b47
Stock reconciliation when valuation rate column is blank
2014-09-01 18:16:24 +05:30
Nabin Hait
12ce3eefca
landed cost voucher added in module page
2014-09-01 18:16:24 +05:30
Anand Doshi
f395b7ce11
[hotfix] item grid rate visibility booboo
2014-09-01 17:26:00 +05:30
Anand Doshi
4228adfaa7
Merge pull request #2109 from ankitjavalkarwork/recurringorder2
...
Commonified Recurring for Sales Invoice and Sales Order
2014-09-01 16:34:12 +05:30
Anand Doshi
8ad474b910
Merge pull request #2122 from neilLasrado/print-templates-fix
...
[Cosmetics] Print Templates Layout Improved
2014-09-01 16:33:34 +05:30
ankitjavalkarwork
737d8e4d9f
fix minor issue and set default value send as pdf
2014-09-01 16:22:56 +05:30
ankitjavalkarwork
aaac7c17b8
Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document
2014-09-01 16:22:56 +05:30
ankitjavalkarwork
28a975dd32
Add patch for field name change in SI, rename email template
2014-09-01 16:22:56 +05:30
ankitjavalkarwork
e60822b094
Add tests for Recurring Document, Sales Inv, Sales Order, fix minor errors
2014-09-01 16:20:59 +05:30
ankitjavalkarwork
ac085e0f59
Add manage_recurring_documents and path to hooks, fix minor issues
2014-09-01 16:20:59 +05:30
ankitjavalkarwork
e8331d40f3
Commonify Recurring Sales Order/Invoice
2014-09-01 16:20:59 +05:30
Rushabh Mehta
21b8d30c80
Merge pull request #2131 from anandpdoshi/anand-september-1
...
Hide Rate, Amount in Item Grid template based on permlevel
2014-09-01 12:52:45 +05:30
Anand Doshi
24989b90ba
Hide Rate, Amount in Item Grid template based on permlevel
2014-09-01 12:38:09 +05:30
Nabin Hait
4f1bccb53d
Merge pull request #2129 from anandpdoshi/anand-september-1
...
[patch] Set company's country
2014-09-01 11:11:19 +05:30
Anand Doshi
98eacdb785
[patch] Set company's country
2014-09-01 10:23:47 +05:30
Neil Trini Lasrado
8331ec7482
[cosmetics] Cheque Print format 2
2014-08-29 20:27:45 +05:30
Neil Trini Lasrado
d43752fc4f
[cosmetics] Cheque Print format 1
2014-08-29 16:43:48 +05:30
Neil Trini Lasrado
bd03c8b28a
Merge branch 'develop' of https://github.com/frappe/erpnext into print-templates-fix
2014-08-29 16:42:44 +05:30
Anand Doshi
d490933fce
Merge pull request #2125 from anandpdoshi/anand-august-29
...
[fix] Maintenance Schedule, Incoming Rate
2014-08-29 16:38:03 +05:30
Neil Trini Lasrado
f65817d4c2
[cosmetics] payment receipt Print format 1
2014-08-29 16:31:57 +05:30
Anand Doshi
40a8ae2907
[fix] get incoming rate
2014-08-29 16:28:31 +05:30
Anand Doshi
12b98027ee
[fix] Maintenance Scheduler periodicity validation
2014-08-29 16:11:11 +05:30
Neil Trini Lasrado
45a0ea9628
Merge branch 'develop' of https://github.com/frappe/erpnext into print-templates-fix
2014-08-29 15:48:42 +05:30
Anand Doshi
98ff85dea1
Merge pull request #2108 from neilLasrado/fix-issue-448
...
[Fix] Issue #448
2014-08-29 15:46:13 +05:30
Anand Doshi
0015157cba
Merge pull request #2120 from nabinhait/hotfix
...
Fixes in BOM and maintenance schedule
2014-08-29 15:43:00 +05:30
Anand Doshi
f513531d3a
Merge pull request #2114 from neilLasrado/credit-note-feature
...
[print-template] Credit Note Issue #31
2014-08-29 15:32:42 +05:30
Neil Trini Lasrado
4e16e9ed89
Refactored Credit Note Print Format
2014-08-29 13:20:58 +05:30
Anand Doshi
9f0ea97d85
[fix] get future vouchers query
...
[print-template] Credit Note Issue #31 2
2014-08-29 12:50:28 +05:30
Neil Trini Lasrado
7a435bb4f1
[print-template] Credit Note Issue #31 1
2014-08-29 12:50:28 +05:30
Neil Trini Lasrado
014346acba
[print-template] Credit Note
2014-08-29 12:50:28 +05:30
Anand Doshi
c90773cc85
Merge pull request #2115 from anandpdoshi/user-permission-doctypes
...
HR permissions, translations
2014-08-29 11:55:51 +05:30
Nabin Hait
0514e07ef4
minor fix
2014-08-29 11:50:59 +05:30
Nabin Hait
14b8af2e65
Rounding issue fixed for bom quantity
2014-08-29 11:50:58 +05:30
Nabin Hait
818bacae49
Minor fix in maintenance schedule
2014-08-29 11:50:58 +05:30
Anand Doshi
6ba2e3deef
Merge pull request #2118 from anandpdoshi/anand-august-28
...
[fix] default quotation list filter
2014-08-29 11:25:21 +05:30
Anand Doshi
bb370f3b6a
HR - Leave Approver and Expense Approver fields changed to Link Fields, better default permissions
2014-08-29 11:19:10 +05:30
Anand Doshi
f680626f53
[minor] send translations in response
2014-08-29 11:19:10 +05:30
Neil Trini Lasrado
83ca3e5563
[Cosmetics] Print Templates Layout Improved
2014-08-28 14:48:16 +05:30
Anand Doshi
37cb544839
[fix] default quotation list filter
2014-08-28 11:27:18 +05:30
Nabin Hait
ec8964dde5
Merge pull request #2117 from anandpdoshi/anand-august-27
...
[fix] get future vouchers query
2014-08-28 10:43:35 +05:30
Anand Doshi
913c51b1f8
[fix] get future vouchers query
2014-08-27 22:09:15 +05:30
Neil Trini Lasrado
cd1efb94ed
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-issue-448
2014-08-27 18:49:03 +05:30
Neil Trini Lasrado
d6d71e8078
[fix] issue 448 final 1
2014-08-27 18:48:57 +05:30
Pratik Vyas
4cb67339c5
Merge pull request #2112 from anandpdoshi/anand-august-27
...
Enqueue Newsletter sending in Longjob Queue
2014-08-27 15:14:26 +05:30
Neil Trini Lasrado
4b71fe6fc1
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-issue-448
2014-08-27 12:31:31 +05:30
Anand Doshi
46256cddd7
Enqueue Newsletter sending in Longjob Queue
2014-08-27 12:23:52 +05:30
Neil Trini Lasrado
ad24069cdc
[fix] issue 448 final
2014-08-26 16:30:39 +05:30
Nabin Hait
3b1733bc04
minor fix in sales invoice test records
2014-08-26 16:30:39 +05:30
Anand Doshi
43f087c99d
[hotfix] Supplier read permission for Purchase User
...
[Fix] Issue #448
[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Nabin Hait
54ca95bc6e
Merge pull request #2110 from nabinhait/hotfix
...
minor fix in sales invoice test records
2014-08-26 16:21:32 +05:30
Nabin Hait
e3f2323e14
minor fix in sales invoice test records
2014-08-26 16:20:38 +05:30
Anand Doshi
c147667486
[hotfix] Supplier read permission for Purchase User
2014-08-26 14:26:07 +05:30
Anand Doshi
5ed2c06eb5
Merge pull request #2089 from neilLasrado/item_group
...
Item group
2014-08-26 12:56:54 +05:30
Neil Trini Lasrado
9d1e8b61fe
[Fix] Issue #980 final
2014-08-25 19:04:30 +05:30
Anand Doshi
e0ffe7a575
[hotfix] Product Search
2014-08-25 18:38:08 +05:30
Neil Trini Lasrado
d676491b6e
Merge https://github.com/frappe/erpnext into item_group
2014-08-25 16:18:31 +05:30
Anand Doshi
580f447bbd
Merge pull request #2100 from rmehta/aug-22
...
[cleanup] remove allow_attach
2014-08-25 16:07:50 +05:30
Rushabh Mehta
52f04da5f5
[style] default website
2014-08-25 15:17:20 +05:30
Nabin Hait
06927a20b2
Update repost_stock.py
2014-08-25 14:08:54 +05:30
Neil Trini Lasrado
caba531e89
[fix] issue#980
2014-08-25 13:22:15 +05:30
Rushabh Mehta
7a6ab91080
remove set_title_left
2014-08-25 13:04:22 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Anand Doshi
bb6b58c271
Merge pull request #2074 from neilLasrado/purchase-invoice-fix
...
[fix] frappe/erpnext#1510
2014-08-25 12:51:16 +05:30
Anand Doshi
def374370f
Merge pull request #2083 from geo-poland/basic-polish-language-support
...
Basic Polish language support
2014-08-25 12:48:33 +05:30
Nabin Hait
b748115609
Merge pull request #2101 from nabinhait/hotfix
...
Required raw materials qty in PP tool
2014-08-23 20:05:42 +05:30
Nabin Hait
a592a914b8
PP Tool: get query for sales order
2014-08-22 16:25:04 +05:30
Nabin Hait
1ae48f4988
Required raw materials qty in PP tool
2014-08-22 16:20:07 +05:30
Nabin Hait
bb29d15d5a
Merge pull request #2099 from nabinhait/hotfix
...
Minor fixes
2014-08-22 15:26:38 +05:30
Nabin Hait
40e3d0c780
General ledger: debit/credit value rounding upto 3 decimals
2014-08-22 14:37:55 +05:30
Nabin Hait
00fc600e8b
PP Tool: Raise material request based on projected qty in selected warehouse
2014-08-22 14:06:22 +05:30
Nabin Hait
f4ad37d208
Reset receiver list always on create receiver list button
2014-08-22 12:42:57 +05:30
Nabin Hait
79f91109cd
Update pricing_rule.py
2014-08-21 19:21:25 +05:30
Nabin Hait
d67cbdf725
Merge pull request #2097 from nabinhait/hotfix
...
Escaped item group value in pricing rule condition
2014-08-21 19:19:34 +05:30
Nabin Hait
16aba71da0
Escaped item group value in pricing rule condition
2014-08-21 19:02:02 +05:30
Nabin Hait
9426522159
Merge pull request #2096 from nabinhait/hotfix
...
Fixex in payment reconciliation
2014-08-21 18:07:39 +05:30
Nabin Hait
8058832a48
Fixex in payment reconciliation
2014-08-21 18:06:35 +05:30
Nabin Hait
fa3f22c448
Merge pull request #2093 from nabinhait/hotfix
...
Packing list visibility and update status on communication
2014-08-21 17:34:58 +05:30
Nabin Hait
cabf9c5bee
Minor fix in status updater
2014-08-21 16:44:32 +05:30
Nabin Hait
4417529952
Packing list visibility issue
2014-08-21 16:44:32 +05:30
Anand Doshi
bb3f192b07
Merge pull request #2091 from nabinhait/hotfix
...
Minor fixes
2014-08-21 12:42:40 +05:30
Nabin Hait
f71011aff0
Project query fixed
2014-08-21 11:34:31 +05:30
Nabin Hait
df5ab4e228
Minor fix in maintenance schedule
2014-08-21 11:32:39 +05:30
Neil Trini Lasrado
b02b59b8c8
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-invoice-fix
2014-08-20 14:57:24 +05:30
Rushabh Mehta
f29449ba07
Merge pull request #2086 from rmehta/route-redesign
...
Route redesign
2014-08-20 14:49:27 +05:30
Neil Trini Lasrado
bf4ceb981f
Merge https://github.com/frappe/erpnext into purchase-invoice-fix
2014-08-20 14:39:22 +05:30
Neil Trini Lasrado
84e5a4a2c2
[fix-remarks-changed-issue#110]
2014-08-20 13:44:56 +05:30
Rushabh Mehta
ebd30beee4
[route] redesigned
2014-08-20 11:44:30 +05:30
Rushabh Mehta
cb067aa579
[route] refactor, wip
2014-08-20 11:44:30 +05:30
Rushabh Mehta
74bc2baa1d
remove website route, wip
2014-08-20 11:43:58 +05:30
Tytus
f546ab3130
Add csv file with initial translations.
2014-08-19 15:53:08 +02:00
Tytus
35142cb206
Add Polish language to setup wizard.
2014-08-19 15:51:36 +02:00
Nabin Hait
13313b5cb6
Merge pull request #2082 from nabinhait/hotfix
...
Bank reconciliation statement: show amounts which has cleared in the ban...
2014-08-19 17:42:26 +05:30
Nabin Hait
432431f2e6
fix for translation
2014-08-19 16:49:44 +05:30
Anand Doshi
dd952146d1
Merge pull request #2081 from anandpdoshi/anand-august-19
...
[fix] Error Reports
2014-08-19 16:37:50 +05:30
Nabin Hait
237f3765e5
Bank reconciliation statement: show amounts which has cleared in the bank but not registered in the system
2014-08-19 16:29:31 +05:30
Anand Doshi
cca6460e65
[fix] Error Reports
2014-08-19 16:06:09 +05:30
Rushabh Mehta
354acf6fc9
Merge pull request #2076 from anandpdoshi/anand-august-19
...
[fix] Error Reports
2014-08-19 14:07:03 +05:30
Anand Doshi
7ce0609800
Merge pull request #2077 from nabinhait/hotfix
...
Precision issue in tax calculation
2014-08-19 13:43:23 +05:30
Nabin Hait
0a35effe49
Precision issue in tax calculation
2014-08-19 13:22:19 +05:30
Neil Trini Lasrado
95b395505f
[new fix issue No #1510 ]
2014-08-19 13:12:33 +05:30
Neil Trini Lasrado
67e14a48b8
[fix issue No #1510 ]
2014-08-19 12:35:14 +05:30
Neil Trini Lasrado
2026148dbe
[fix issue No #1510 ]
2014-08-19 12:22:45 +05:30
Anand Doshi
78b6366325
[fix] Error Reports
2014-08-19 12:20:48 +05:30
Neil Trini Lasrado
9c3535307f
[fix] frappe/erpnext#1510
2014-08-19 10:41:34 +05:30
Rushabh Mehta
5e893ef8fd
Merge pull request #2073 from anandpdoshi/anand-august-18
...
[fix] Leave Application Calendar - Fixes #2065
2014-08-18 22:11:28 +05:30
Anand Doshi
f72de95a38
[fix] SMS Center
2014-08-18 19:51:47 +05:30
Anand Doshi
6ab831b387
Allow Default Warehouse for Item, even if not a Stock Item
2014-08-18 19:04:19 +05:30
Anand Doshi
e4c434ab6f
[fix] Leave Application Calendar
2014-08-18 17:04:04 +05:30
Pratik Vyas
1f3310e0d1
Merge pull request #2072 from nabinhait/hotfix
...
Multiple small fixes
2014-08-18 16:49:06 +05:30
Nabin Hait
c41a9480b8
Credit limit fixes
2014-08-18 15:40:36 +05:30
Nabin Hait
6394f5b1a9
minot fix in pro order
2014-08-18 15:40:36 +05:30
Nabin Hait
448c9b71c1
minot fix in material request
2014-08-18 15:40:36 +05:30
Nabin Hait
32a3a86a00
General ledger report: invalid account
2014-08-18 15:40:36 +05:30
Nabin Hait
dcce0c86ed
Minimum ordered qty validation
2014-08-18 15:40:36 +05:30
Anand Doshi
f4b3d30312
Merge pull request #2071 from anandpdoshi/anand-august-18
...
[minor] Removed 'PIN: ' from default Address Template
2014-08-18 14:53:26 +05:30
Anand Doshi
62aa8fa4e7
[minor] Removed 'PIN: ' from default Address Template
2014-08-18 12:53:37 +05:30
Rushabh Mehta
e8a52d810f
Merge pull request #2067 from dalwadani/develop
...
Improve Arabic translation
2014-08-18 09:54:12 +05:30
Dhaifallah Alwadani
5e27a759b7
Improve Arabic translation
2014-08-16 18:11:48 +01:00
Pratik Vyas
c0d31ce648
Merge pull request #2062 from nabinhait/hotfix
...
Hotfix
2014-08-15 11:06:44 +05:30
Anand Doshi
eb39435481
[hotfix] Allow on submit for Projected Qty
2014-08-14 18:08:19 +05:30
Nabin Hait
54498452b6
Stock entry minor fix
2014-08-14 15:49:44 +05:30
Nabin Hait
821aad5281
Sales/purchase return: fixes for qty validation
2014-08-14 15:15:14 +05:30
Nabin Hait
5145b1445b
Fixes in production planning tool
2014-08-14 15:15:14 +05:30
Nabin Hait
e368091627
Fixes in Payment Reconciliation
2014-08-14 15:15:14 +05:30
Anand Doshi
d5a08ea449
Merge pull request #2055 from rmehta/aug-11
...
Timeline and Folds
2014-08-14 12:00:03 +05:30
Rushabh Mehta
c31a1eec5b
[ux] fixes to timeline
2014-08-14 11:47:31 +05:30
Rushabh Mehta
0d0f5f6c25
[ux] fixes to timeline
2014-08-14 11:43:46 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Anand Doshi
cf8bb668b3
Merge pull request #2051 from anandpdoshi/anand-august-12
...
[logic] Email Digest - use transaction/posting date
2014-08-12 19:51:22 +05:30
Anand Doshi
f0075b9ce2
[fix] Opportunity communication listing
2014-08-12 15:20:39 +05:30
Anand Doshi
67d249eea9
[logic] Email Digest - use transaction/posting date
2014-08-12 12:45:23 +05:30
Anand Doshi
c7105a1a79
Merge branch 'nabinhait-landed_cost' into develop
2014-08-11 18:04:08 +05:30
Anand Doshi
f957cbd8ef
[test] Purchase Receipt - update rejected serial no
2014-08-11 18:03:43 +05:30
Nabin Hait
5c0db8d05e
Landed Cost voucher test case for serialized items
2014-08-11 16:28:29 +05:30
Nabin Hait
200e8d971f
Landed Cost voucher test case for serialized items
2014-08-11 16:12:32 +05:30
Nabin Hait
a97e700371
Add rejected serial nos in Purchase Receipt if auto-created based on series
2014-08-11 16:12:32 +05:30
Nabin Hait
4e6c52dd24
Test case fixes
2014-08-11 16:12:32 +05:30
Nabin Hait
2b776e8c3a
Landed cost voucher minor fixes
2014-08-11 16:12:32 +05:30
Nabin Hait
f3e1181ad9
Landed cost voucher fixes
2014-08-11 16:12:32 +05:30
nabinhait
9cbcf96aeb
no copy property for landed cost voucher amount field
2014-08-11 16:12:32 +05:30
nabinhait
8ca3189f07
pr and pi gl entries
2014-08-11 16:12:31 +05:30
nabinhait
98e7dcfe2c
landed cost voucher minor fix
2014-08-11 16:12:31 +05:30
nabinhait
cfd1b10980
Purchase receipt gl entries if there is warehouse without account
2014-08-11 16:12:31 +05:30
nabinhait
f807cda375
PR and PI gl entries fixes for landed cost
2014-08-11 16:12:31 +05:30
nabinhait
11594c7927
purchase receipt gl entries
2014-08-11 16:12:31 +05:30
nabinhait
509aa52efc
minor fix
2014-08-11 16:12:31 +05:30
nabinhait
e2c3f7ab14
Added help in landed cost voucher
2014-08-11 16:12:31 +05:30
nabinhait
fe39442c48
Removed old landed cost wizard
2014-08-11 16:12:31 +05:30
nabinhait
b21b6598f1
Test case for landed cost voucher
2014-08-11 16:12:31 +05:30
nabinhait
5e1b0014c2
GL entries for sub-contracting and rejected qty
2014-08-11 16:12:31 +05:30
nabinhait
cc0692d714
landed cost fix
2014-08-11 16:12:31 +05:30
nabinhait
87f2401c1e
Landed Cost on_submit and gl entries for PR
2014-08-11 16:12:31 +05:30
nabinhait
f6ea21c8ae
landed cost voucher design changed #1921
2014-08-11 16:12:30 +05:30
nabinhait
4436157da1
Landed cost redesign initial commit #1921
2014-08-11 16:12:30 +05:30
Anand Doshi
b00a2422e4
[hotfix] Allow on Submit - Actual / Projected Qty for Packed Item
2014-08-11 15:54:20 +05:30
Anand Doshi
475b118fba
Merge pull request #2050 from anandpdoshi/anand-august-11
...
Feed, Form Grid
2014-08-11 13:44:01 +05:30
Anand Doshi
42335fb2cb
[minor] Allow on Submit - Actual / Projected Qty
2014-08-11 13:28:29 +05:30
Anand Doshi
15ec1e1860
Merge pull request #2049 from nabinhait/hotfix
...
Fixes in Order trends report
2014-08-11 12:48:16 +05:30
Anand Doshi
96964a4e03
[minor] Visible Columns' Label should show ellipsis on overflow
2014-08-11 12:28:32 +05:30
Anand Doshi
e4aaa3d18f
[minor] Truncate comment in Feed to 240 chars
2014-08-11 12:27:47 +05:30
Nabin Hait
a6b597a0bd
Fixes in Order trends report
2014-08-11 11:54:37 +05:30
Anand Doshi
52d1ea83a0
[hotfix] Stock Entry List
2014-08-11 09:16:59 +05:30
Anand Doshi
5d64f5abd4
[hotfix] Sales Order list
2014-08-09 14:54:52 +05:30
Anand Doshi
3e103ebffe
[minor] ERPNext uses MariaDB
2014-08-08 17:36:25 +05:30
Rushabh Mehta
992bc448a2
Merge pull request #2045 from rmehta/fixes-aug-8
...
[fix] [pos] pos view only for draft docs
2014-08-08 17:30:12 +05:30
Rushabh Mehta
23607f91cd
[fix] [pos] pos view only for draft docs
2014-08-08 17:29:16 +05:30
Anand Doshi
3a97739f83
Merge pull request #2042 from rmehta/pos-module
...
added icon for pos
2014-08-08 16:56:45 +05:30
Rushabh Mehta
e0ee6fe8cd
Merge pull request #2044 from nabinhait/hotfix
...
PO-PI mapping: divisional loss issue fixed
2014-08-08 16:44:15 +05:30
Rushabh Mehta
a3f76fc14d
Update sales_invoice.js
2014-08-08 16:43:21 +05:30
Nabin Hait
c85abbfeca
PO-PI mapping: divisional loss issue fixed
2014-08-08 16:07:02 +05:30
Rushabh Mehta
139ec2a64f
Update note_list.html
2014-08-08 15:47:56 +05:30
Rushabh Mehta
72e1719220
added icon for pos
2014-08-08 15:43:26 +05:30
Pratik Vyas
3de7757ba4
Update update_project_milestones.py
2014-08-08 14:49:53 +05:30
Anand Doshi
7c3fad63b1
Merge pull request #2040 from anandpdoshi/anand-august-8
...
[patch] Add currency Turkish Lira
2014-08-08 14:17:39 +05:30
Anand Doshi
6b8145a813
[patch] Add currency Turkish Lira
2014-08-08 14:05:01 +05:30
Nabin Hait
688a7a7329
Merge pull request #2039 from anandpdoshi/anand-august-8
...
[fix] Show Employee Name in Employee Birthday report
2014-08-08 13:21:36 +05:30
Anand Doshi
26201a5828
[fix] Show Employee Name in Employee Birthday report
2014-08-08 12:49:11 +05:30
Anand Doshi
6cd59537b6
Merge pull request #2037 from nabinhait/hotfix
...
Fixes in 'Received Items to be Billed' report
2014-08-08 12:45:56 +05:30
Anand Doshi
854f9895e4
Merge branch 'rmehta-microtemplate-fixes' into develop
2014-08-08 11:56:52 +05:30
Anand Doshi
4cc94df752
[tests] Fixed Test Records
2014-08-08 11:56:32 +05:30
Anand Doshi
03eadb74ab
Fixes to microtemplate feature
2014-08-08 11:56:32 +05:30
Rushabh Mehta
7a4e739d6c
templating for hr
2014-08-08 11:56:32 +05:30
Rushabh Mehta
a660464cec
added for support
2014-08-08 11:56:32 +05:30
Rushabh Mehta
c9bd3f5d4a
added templates for projects
2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5
more updates to lists and started sane filters
2014-08-08 11:56:32 +05:30
Rushabh Mehta
8544447b19
added more listview templates
2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015
added listviews for sales, purchase
2014-08-08 11:56:31 +05:30
Rushabh Mehta
67af99794d
start custom list rendering for Sales Order
2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a
built item grids for sales, purchase, stock
2014-08-08 11:56:31 +05:30
Anand Doshi
c13727adba
Merge branch 'rmehta-primary-action-fixes' into develop
2014-08-08 11:55:37 +05:30
Anand Doshi
69ccf9695c
[minor] primary action
2014-08-08 11:51:24 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
Nabin Hait
f4de6e21fa
Fixes in 'Received Items to be Billed' report
2014-08-08 11:23:59 +05:30
Nabin Hait
a6db05e18d
Fixes in 'Received Items to be Billed' report
2014-08-08 11:02:06 +05:30
Nabin Hait
d91cefb23d
Update fix_account_master_type.py
2014-08-07 19:22:02 +05:30
Anand Doshi
e7f7416190
Merge pull request #2035 from nabinhait/hotfix
...
Account master type patch and Stock RBNB Diff
2014-08-07 18:15:25 +05:30
Nabin Hait
67cd3fb89c
Fixes in making credit note from Sales Return
2014-08-07 15:34:53 +05:30
Nabin Hait
849b7b172a
minor fix
2014-08-07 15:13:52 +05:30
Nabin Hait
9a0c46fda7
Get Stock Rreceived But Not Billed Difference Amount
2014-08-07 15:10:05 +05:30
Nabin Hait
05b56d0d08
Fix account's master type
2014-08-07 15:03:41 +05:30
Anand Doshi
43ffa64849
Merge pull request #2030 from nabinhait/hotfix
...
Hotfix
2014-08-06 17:39:33 +05:30
Nabin Hait
7881df2138
minor fix
2014-08-06 17:29:07 +05:30
Nabin Hait
fd90571d49
fiscal year validation in financial statement
2014-08-06 17:25:23 +05:30
Nabin Hait
9f7e00bb3a
Send salary slip mail after submit via Salary Manager
2014-08-06 17:25:23 +05:30
Nabin Hait
45b7d17ee8
Employee can be reselected but not changed in salary structure
2014-08-06 17:25:23 +05:30
Rushabh Mehta
859a995bd6
Merge pull request #2025 from anandpdoshi/anand-august-5
...
[test] Block Delivery Note if it is linked to a cancelled Sales Order
2014-08-05 14:44:38 +05:30
Anand Doshi
959bd6e9e7
[test] Block Delivery Note if it is linked to a cancelled Sales Order
2014-08-05 14:25:40 +05:30
Anand Doshi
9c47cae5c7
Merge pull request #2024 from anandpdoshi/anand-august-5
...
Print Fixes
2014-08-05 14:13:17 +05:30
Anand Doshi
f16fefafe3
[print] [fix] empty item grid issue
2014-08-05 13:57:29 +05:30
Anand Doshi
8d16e9fd6d
[print] convert newlines to <br> based on fieldtype for Text/Small Text
2014-08-05 11:39:51 +05:30
Anand Doshi
2b8344e75c
[print] [fix] when item grid is empty
2014-08-05 11:30:37 +05:30
Rushabh Mehta
a8755af0fa
Merge pull request #2022 from nabinhait/hotfix
...
Fixes for customer / supplier renaming
2014-08-05 10:42:44 +05:30
Rushabh Mehta
ca70eaa388
Merge pull request #2019 from anandpdoshi/anand-august-1
...
Account Issues
2014-08-05 10:36:08 +05:30
Pratik Vyas
1271bc4457
[hotfix] [patch] remove missing patch
2014-08-05 06:54:11 +05:30
Nabin Hait
4d18b3f96d
Fixes for standard print formats
2014-08-04 17:01:01 +05:30
Nabin Hait
1279f1d430
Fixes for customer / supplier renaming
2014-08-04 13:05:59 +05:30
Anand Doshi
e88b7fbcc4
Journal Voucher Detail: show Account Balance as Dr or Cr. Fixes #675
2014-08-01 16:56:32 +05:30
Anand Doshi
8c838061f9
[minor] Check account read permission for get_balance_on
2014-08-01 16:13:44 +05:30
Anand Doshi
6c608e04bc
Fixes #699 - Cost Center mandatory
2014-08-01 16:04:35 +05:30
Anand Doshi
6e4efa7edd
Merge pull request #2013 from anandpdoshi/anand-july-31
...
Fixes and Translations
2014-08-01 11:12:19 +05:30
Anand Doshi
a66ef778ec
[translations] Added Turkish, Vietnamese. Updated rest of the translations. [ frappe/erpnext#2012 ]
2014-08-01 00:06:42 +05:30
Anand Doshi
1b90207360
[minor] [fix] Serial No Servic Contract Expiry
2014-07-31 18:57:51 +05:30
Anand Doshi
3f28ac3205
Merge pull request #2010 from anandpdoshi/anand-july-31
...
[print] Labels and Total Taxes and Charges
2014-07-31 16:31:57 +05:30
Anand Doshi
29817d6d8b
[print] Moved Total Taxes and Charges to the right column
2014-07-31 16:05:19 +05:30
Anand Doshi
92980e6882
Merge pull request #2009 from anandpdoshi/anand-july-31
...
Labels: Use Date instead of Posting Date
2014-07-31 15:07:11 +05:30
Anand Doshi
b4ad175b13
Merge pull request #2008 from pdvyas/print-format-patch-fix
...
[patch] remove reloading of removed print formats
2014-07-31 14:53:45 +05:30
Pratik Vyas
b91079676d
[patch] remove reloading of removed print formats
2014-07-31 14:31:58 +05:30
Anand Doshi
fbe37c9158
Labels: Use Date instead of Posting Date
2014-07-31 14:31:25 +05:30
Pratik Vyas
1483e9d8d2
Merge pull request #2007 from nabinhait/hotfix
...
Activity: fix for timeline-wise display
2014-07-31 12:45:43 +05:30
nabinhait
8efd74b9b1
Activity: fix for timeline-wise display
2014-07-31 12:12:05 +05:30
Anand Doshi
c2371af779
Merge pull request #2001 from nabinhait/hotfix
...
Validation: Account must belong to the same company
2014-07-31 11:55:56 +05:30
nabinhait
8dbd295c9b
bom operations on_delete_row function
2014-07-31 11:40:41 +05:30
nabinhait
d6ff58daa1
Minor fix in customer issue
2014-07-31 11:40:41 +05:30
nabinhait
4859b48c43
message fix
2014-07-31 11:40:41 +05:30
nabinhait
c34329284b
Post gl entries only if there are atleast 2 distinct account head
2014-07-31 11:40:41 +05:30
nabinhait
0ad677045a
Test record fixed for warehouse
2014-07-31 11:40:40 +05:30
nabinhait
c1f65dd863
Validation: Account must belong to the same company
2014-07-31 11:40:40 +05:30
Anand Doshi
b9fed3f046
Merge pull request #2004 from anandpdoshi/anand-july-30
...
[fixes] Leave Application and Toggle Rounded Totals
2014-07-30 17:40:01 +05:30
Anand Doshi
35cc320e21
[fixes] Leave Application and Toggle Rounded Totals
2014-07-30 17:00:26 +05:30
Pratik Vyas
5a5b405a18
Update .travis.yml
2014-07-30 16:49:05 +05:30
Pratik Vyas
cd4d6a228b
Update .travis.yml
2014-07-30 16:42:39 +05:30
Anand Doshi
6c5e1c9701
Merge pull request #2003 from anandpdoshi/anand-july-30
...
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
2014-07-30 14:10:16 +05:30
Anand Doshi
627f13ea26
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
2014-07-30 13:09:01 +05:30
Anand Doshi
20fbfa2a44
[travis]
2014-07-30 11:50:05 +05:30
Anand Doshi
3f790eae55
[travis]
2014-07-29 23:42:30 +05:30
Anand Doshi
ddbf14adba
Merge pull request #2002 from anandpdoshi/anand-july-29
...
[print] Hide Rate, Amount if Print Without Amount in Delivery Note
2014-07-29 23:38:24 +05:30
Anand Doshi
22608ad206
[travis]
2014-07-29 23:20:42 +05:30
Anand Doshi
60ee2ea8af
[hotfix] Stock Entry search fields
2014-07-29 23:16:24 +05:30
Anand Doshi
bc708ee4c2
[print] Disable rounded total
2014-07-29 22:24:31 +05:30
Anand Doshi
0e93352c8d
[print] Hide Rate, Amount if Print Without Amount in Delivery Note
2014-07-29 22:03:40 +05:30
Anand Doshi
a12312553b
Merge pull request #1997 from nabinhait/hotfix
...
Fixes
2014-07-29 15:48:04 +05:30
nabinhait
78777e141a
minor fix
2014-07-29 15:19:41 +05:30
Anand Doshi
9d9192d496
Merge pull request #2000 from anandpdoshi/anand-july-29
...
[print] Improvements to Item grid
2014-07-29 15:13:22 +05:30
Anand Doshi
ad1638e6b6
[print] Improvements to Item grid
2014-07-29 14:38:48 +05:30
nabinhait
0bab81aef9
minor fix in chart of accounts help message
2014-07-29 12:59:47 +05:30
nabinhait
92a1e06665
message fix
2014-07-29 12:46:56 +05:30
nabinhait
079611936f
Delete Payment-to-invoice-matching-tool through patch
2014-07-29 12:12:09 +05:30
nabinhait
d4b92a1d20
Set ignore pricing rule while mapping SI to DN
2014-07-29 11:35:41 +05:30
nabinhait
7555d619f2
Message for frozen stock entries
2014-07-29 11:35:41 +05:30
Anand Doshi
bd748bd115
[hotfix] [patch] Delete old print formats
2014-07-29 08:51:41 +05:30
Anand Doshi
85eefadada
[fix] [print] Print Hide Item Code
2014-07-28 21:17:20 +05:30
Anand Doshi
07d3261467
[hotfix] don't override default print format if specified in POS Sales Invoice
2014-07-28 19:55:13 +05:30
Anand Doshi
11586eda4c
[minor] [fix] taxes print
2014-07-28 17:38:08 +05:30
Anand Doshi
423361946d
Merge pull request #1996 from nabinhait/hotfix
...
Fixes
2014-07-28 16:56:11 +05:30
nabinhait
0a35277c96
Stock reconciliation only for valuation
2014-07-28 16:41:34 +05:30
nabinhait
16317748dd
Issue fixes related to length of the report result
2014-07-28 16:41:34 +05:30
nabinhait
3d48a4ef65
Sales / purchase return: Get party details fix
2014-07-28 16:41:33 +05:30
nabinhait
b739264243
Don't run company trigger on amendment
2014-07-28 16:41:33 +05:30
nabinhait
957971eb1d
Column added 'Reqd by Date' in po_items_to_be_billed report
2014-07-28 16:41:33 +05:30
Anand Doshi
e3c161f0ea
Merge pull request #1995 from anandpdoshi/anand-july-28
...
[minor] apply pricing rule / price list only if item_code
2014-07-28 16:05:42 +05:30
Anand Doshi
39edcbc93b
[minor] apply pricing rule / price list only if item_code
2014-07-28 16:00:19 +05:30
Anand Doshi
beb3e35153
Merge pull request #1989 from dalwadani/develop
...
Improve Arabic Translation
2014-07-28 15:46:22 +05:30
Anand Doshi
0416e59267
Merge pull request #1994 from anandpdoshi/anand-july-28
...
[minor] Show company name in General Ledger print
2014-07-28 15:44:07 +05:30
Anand Doshi
57f8dabf59
[minor] Show company name in General Ledger print
2014-07-28 15:28:44 +05:30
Anand Doshi
9ea4154b81
Merge pull request #1993 from anandpdoshi/anand-july-28
...
[minor] Fixed address listing
2014-07-28 14:21:29 +05:30
Anand Doshi
9c018fe984
[minor] Fixed address listing
2014-07-28 12:59:52 +05:30
Dhaifallah Alwadani
faeca7cf11
Improve Arabic Translation
2014-07-26 05:43:03 +03:00
Nabin Hait
f8b318aef1
Merge pull request #1987 from anandpdoshi/anand-july-25
...
[fix] Feed listing based on permissions
2014-07-25 15:08:30 +05:30
Anand Doshi
93e2defc96
[fix] Feed listing based on permissions
2014-07-25 14:57:37 +05:30
Anand Doshi
1c735365d0
Merge pull request #1986 from anandpdoshi/rmehta-print-formats
...
Print Formats (by Rushabh)
2014-07-25 13:58:18 +05:30
Anand Doshi
161f63d393
[travis] Install wkhtmltopdf
2014-07-25 13:36:47 +05:30
Anand Doshi
8f49cf7c03
[minor] fixed testcase
2014-07-25 13:02:29 +05:30
Anand Doshi
62b1cbf003
[impact] Limit available functions in jinja environment
2014-07-25 13:02:29 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Anand Doshi
16deabef82
Format Qty
2014-07-25 13:02:28 +05:30
ankitjavalkarwork
82ec488b99
Payment Reconciliation Feature/Tool - Patch
2014-07-25 13:02:28 +05:30
Rushabh Mehta
781ddc3a25
added patch to remove old print formats
2014-07-25 13:02:28 +05:30
Rushabh Mehta
85ff3bcd04
updated pos invoice
2014-07-25 13:01:53 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
Rushabh Mehta
d82352eacc
item grid, added other printable fields in description
2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c
cleanup for print format
2014-07-25 13:01:52 +05:30
Rushabh Mehta
28804bfb62
started sales order print format (new style)
2014-07-25 13:01:52 +05:30
Nabin Hait
5cf3a6bcd2
Merge pull request #1975 from anandpdoshi/anand-july-22
...
Trial Balance and Newsletter sending via Worker
2014-07-25 11:21:13 +05:30
Anand Doshi
329a8ef9a1
Merge pull request #1985 from ankitjavalkarwork/payrec
...
Remove Payment To Invoice Matching Tool
2014-07-24 18:57:46 +05:30
Anand Doshi
9e89dcf855
Merge pull request #1984 from nabinhait/hotfix
...
Fix for company in chart of accounts
2014-07-24 18:57:31 +05:30
ankitjavalkarwork
344dd3793a
Merge branch 'develop' of https://github.com/frappe/erpnext into payrec
2014-07-24 15:15:12 +05:30
ankitjavalkarwork
d93f4c99e1
Remove Payment To Invoice Matching Tool
2014-07-24 15:14:36 +05:30
nabinhait
ffd57a0565
Fix for company in chart of accounts
2014-07-24 10:40:18 +05:30
Rushabh Mehta
92c043423e
updated bench
2014-07-23 15:57:01 +05:30
Anand Doshi
d1a2ce2750
[minor] is_ajax check in newsletter
2014-07-23 12:51:17 +05:30
Rushabh Mehta
3c78ab5841
[email digest] [fix] [hot] only open to-do items
2014-07-23 10:19:31 +05:30
Anand Doshi
de85a3af15
Newsletter: Bulk Send via worker
2014-07-22 19:49:16 +05:30
Anand Doshi
cb86d597b7
Report: Trial Balance
2014-07-22 19:49:16 +05:30
Nabin Hait
9df4196597
Merge pull request #1970 from ankitjavalkarwork/payrec
...
Added Payment Reconciliation to list accounts.py
2014-07-22 18:24:58 +05:30
ankitjavalkarwork
87633d6be6
Payment Reconciliation Feature/Tool - Patch
2014-07-22 18:14:30 +05:30
Anand Doshi
33a94a74df
Merge pull request #1968 from nabinhait/hotfix
...
Fixes
2014-07-22 17:39:07 +05:30
ankitjavalkarwork
b5ae643b6e
Payment Reconciliation Feature/Tool - minor change
2014-07-22 15:26:04 +05:30
ankitjavalkarwork
b0cffac79d
Payment Reconciliation Feature/Tool - add in module list
2014-07-22 15:02:59 +05:30
nabinhait
b5f9b5de45
PP Tool: data for required raw materials
2014-07-22 11:38:15 +05:30
nabinhait
c772b3d86a
Purchase invoice: Copy project name from first row on addition of row
2014-07-22 11:38:14 +05:30
nabinhait
7d7123de37
Merge branch 'ankitjavalkarwork-wip_payrec' into develop
2014-07-21 19:23:20 +05:30
nabinhait
7f1e4a29c5
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2014-07-21 19:23:07 +05:30
nabinhait
97ab902895
payment reconciliation fixes
2014-07-21 19:22:02 +05:30
Anand Doshi
6e15f675a5
Merge pull request #1966 from anandpdoshi/anand-july-21
...
Stock Entry Warehouse prefill, Item autosuggest by description
2014-07-21 18:25:16 +05:30
Anand Doshi
67ecce695d
[fix] Show against account in General Ledger Print Format
2014-07-21 18:13:05 +05:30
Anand Doshi
ac11d6ff97
Merge pull request #1964 from frappe/new-production-order-fix
...
[minor] fix server error for new production order if sales order is invalid
2014-07-21 18:05:06 +05:30
Anand Doshi
4c5d7617fb
[minor] Update if missing, source and target warehouse in stock entry detail table, when they are specified in the form
2014-07-21 18:02:22 +05:30
Anand Doshi
7fcb3c9865
[minor] Item query - search by description
2014-07-21 17:51:32 +05:30
Pratik Vyas
994d9075b4
Change TRAVIS_BRANCH to develop
2014-07-21 17:36:50 +05:30
Pratik Vyas
649d18c4f7
[minor] fix server error for new production order if sales order is invalid
2014-07-21 17:17:59 +05:30
Nabin Hait
cbf0cb7de7
Merge pull request #1955 from anandpdoshi/financial-statements
...
Balance Sheet and Profit and Loss Statement
2014-07-21 16:44:46 +05:30
Anand Doshi
5f0459c321
Fixes to Financial Statements
2014-07-21 16:13:06 +05:30
nabinhait
2d355c7478
Merge branch 'wip_payrec' of github.com:ankitjavalkarwork/erpnext into ankitjavalkarwork-wip_payrec
2014-07-21 15:33:50 +05:30
ankitjavalkarwork
4dfe19e613
Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec
2014-07-21 14:23:52 +05:30
Rushabh Mehta
1c6313679b
Update material_request.js
2014-07-21 13:08:49 +05:30
Anand Doshi
f457bce0e7
Changed localize_date to formatdate
2014-07-21 12:03:04 +05:30
Anand Doshi
6cc5babd2e
Use include directive to embed common print format
2014-07-21 11:43:19 +05:30
Anand Doshi
db4ba39824
Better handling of ignore zero values
2014-07-21 11:43:19 +05:30
Anand Doshi
825d014616
Commonfied code for Financial Statements and added Profit and Loss Statement
2014-07-21 11:43:18 +05:30
Anand Doshi
fa576a22e3
Balance Sheet
2014-07-21 11:43:18 +05:30
Anand Doshi
059f1e09a8
Balance Sheet - first cut
2014-07-21 11:43:18 +05:30
Anand Doshi
7a7675c7ef
Merge pull request #1957 from nabinhait/hotfix
...
Hotfix
2014-07-19 18:17:52 +05:30
nabinhait
b1e7bf16ba
Translate while creating India specific accounts
2014-07-19 17:56:43 +05:30
nabinhait
711e8bec3d
Fixes overflow tolerance
2014-07-19 17:00:15 +05:30
nabinhait
b1c5738a67
Fixes overflow tolerance
2014-07-19 16:53:45 +05:30
ankitjavalkarwork
5283e5a7d8
Add Payment Reconciliation Feature/Tool - JS changes1
2014-07-18 15:54:29 +05:30
Anand Doshi
1a2516d4be
Merge pull request #1953 from anandpdoshi/anand-july-18
...
Minor fix in reorder item
2014-07-18 10:32:14 +05:30
Anand Doshi
d141cf7293
Minor fix in reorder item
2014-07-18 10:31:34 +05:30
Anand Doshi
3c45c37428
Merge pull request #1952 from nabinhait/hotfix
...
Country mandatory in company master
2014-07-18 10:22:13 +05:30
nabinhait
d4e080be29
Country mandatory in company master
2014-07-17 19:32:12 +05:30
ankitjavalkarwork
84fd33ea7a
Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec
2014-07-17 19:11:07 +05:30
ankitjavalkarwork
87e30f68b9
Add Payment Reconciliation Feature/Tool - Complete
2014-07-17 19:10:45 +05:30
Anand Doshi
e8332be285
Merge pull request #1949 from anandpdoshi/anand-july-17
...
Fix in Stock Entry test case
2014-07-17 12:37:42 +05:30
Anand Doshi
e5df7a7f01
Merge pull request #1935 from nabinhait/hotfix
...
Default letter head in general ledger and bank reco statement print
2014-07-17 12:31:34 +05:30
Anand Doshi
fa0db761da
Fix in Stock Entry test case
2014-07-17 12:30:55 +05:30
nabinhait
5f2f955224
From date and to date in general ledger print format
2014-07-17 12:29:56 +05:30
nabinhait
e26204e61d
From date and to date in general ledger print format
2014-07-17 12:22:58 +05:30
nabinhait
fa1cd5faff
Fixed root type of liability accounts
2014-07-17 11:52:50 +05:30
nabinhait
d16081c4d9
Batch no get query fix
2014-07-17 11:08:19 +05:30
nabinhait
143400d444
Batch no get query fix
2014-07-17 11:00:13 +05:30
nabinhait
96cb130263
Default letter head in general ledger and bank reco statement print
2014-07-17 10:56:07 +05:30
Nabin Hait
0a4c824a06
Merge pull request #1946 from anandpdoshi/anand-july-16
...
Fixes in load defaults of transaction.js
2014-07-16 20:04:37 +05:30
Anand Doshi
b8189d7d23
Auto Re-order Item for default warehouse only, if Warehouse wise re-order not specified
2014-07-16 19:24:53 +05:30
Anand Doshi
4b5e89a067
Fixes in Stock Entry test cases
2014-07-16 19:23:58 +05:30
Anand Doshi
f214bfcfc3
Fixes in load defaults of transaction.js
2014-07-16 17:53:02 +05:30
Rushabh Mehta
2e21e25613
Merge pull request #1945 from anandpdoshi/anand-july-16
...
Fixes in Stock Entry and test cases
2014-07-16 17:04:18 +05:30
Anand Doshi
d93fa2f78b
Fixes in Stock Entry and test cases
2014-07-16 16:08:15 +05:30
Anand Doshi
75936cdde5
Merge pull request #1942 from anandpdoshi/anand-july-16
...
Fixes in Setup Wizard and Support Ticket
2014-07-16 13:17:50 +05:30
Anand Doshi
e73ed2afae
Setup Wizard: fixed attachment issue #1940
2014-07-16 11:48:51 +05:30
Anand Doshi
c70d2d23a8
Support Ticket: set resolution_date as None if missing
2014-07-16 11:48:51 +05:30
ankitjavalkarwork
540a1eb6d9
Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec
2014-07-15 18:02:08 +05:30
ankitjavalkarwork
d934cd105b
Add Payment Reconciliation Feature/Tool - invoice entries table population
2014-07-15 18:01:36 +05:30
ankitjavalkarwork
ec05d7f8a1
Add Payment Reconciliation Feature/Tool - javascript validation
2014-07-14 18:28:10 +05:30
ankitjavalkarwork
345753ed19
Add Payment Reconciliation Feature/Tool - fetch unreconciled entries
2014-07-14 16:38:27 +05:30
Anand Doshi
c58e6c0dff
Merge pull request #1932 from nabinhait/hotfix
...
Fixes
2014-07-14 14:28:05 +05:30
Anand Doshi
1829bd84d3
hotfix: website_image
2014-07-14 14:26:42 +05:30
nabinhait
7700c62fa8
Minor fix
2014-07-14 14:21:21 +05:30
Anand Doshi
8efbf5ef33
Merge pull request #1933 from anandpdoshi/anand-july-14
...
Fixed Address and Contact report name
2014-07-14 14:16:26 +05:30
Anand Doshi
e8c5cb8c9a
Fixed Address and Contact report name
2014-07-14 13:10:24 +05:30
nabinhait
d5fd535909
Minor fix, if no default company
2014-07-14 12:39:50 +05:30
nabinhait
b0a8d000b1
Utility: reset serial no status and warehouse
2014-07-14 11:56:03 +05:30
nabinhait
5c38488590
Utility: reset serial no status and warehouse
2014-07-14 11:44:42 +05:30
nabinhait
614fb750b7
set qty as per stock uom in entire purchase cycle
2014-07-14 10:48:12 +05:30
nabinhait
e6cee7b41f
Expense account can be liability account for stock reconciliation
2014-07-14 10:48:11 +05:30
ankitjavalkarwork
0e57b971ad
Add Payment Reconciliation Feature/Tool - minor changes
2014-07-11 16:08:55 +05:30
ankitjavalkarwork
90b79fcd1f
Add Payment Reconciliation Feature/Tool - minor changes
2014-07-11 15:23:26 +05:30
webnotes
9d31705f75
Merge https://github.com/frappe/erpnext into wip_payrec
2014-07-11 11:21:51 +05:30
webnotes
059922cef1
Add Payment Reconciliation Feature/Tool
2014-07-11 11:20:44 +05:30
Rushabh Mehta
8e4a9ba831
Merge pull request #1927 from anandpdoshi/anand-july-10
...
Bank Reconciliation Statement Print Format
2014-07-10 21:59:05 +05:30
Anand Doshi
9b7b9b2e93
Bank Reconciliation Statement Print Format
2014-07-10 18:45:03 +05:30
Rushabh Mehta
e0d7a6869c
Merge pull request #1926 from anandpdoshi/anand-july-10
...
Production Planning Tool - Fixed bom get query
2014-07-10 17:37:34 +05:30
Anand Doshi
28c4bee0b1
Production Planning Tool - Fixed bom get query
2014-07-10 16:43:31 +05:30
Rushabh Mehta
052b5a68ed
Merge pull request #1925 from nabinhait/hotfix
...
Overflow validation fixed
2014-07-10 15:46:08 +05:30
nabinhait
ee8b6f28b8
minor fix
2014-07-10 15:27:27 +05:30
nabinhait
d5fb5d91e9
overflow validation fixed
2014-07-10 15:27:27 +05:30
Anand Doshi
16658c14fe
Merge pull request #1924 from anandpdoshi/anand-july-10
...
Print Hide other charges calculation
2014-07-10 13:09:39 +05:30
Anand Doshi
a96cf5b96b
Print Hide other charges calculation
2014-07-10 12:16:39 +05:30
Anand Doshi
287fe0559e
Merge pull request #1920 from anandpdoshi/anand-july-9
...
Fixes in queries
2014-07-09 13:39:51 +05:30
Anand Doshi
9006bba11e
Merge pull request #1919 from nabinhait/hotfix
...
Github issue fixes
2014-07-09 13:39:38 +05:30
Anand Doshi
48d3b54e02
Fixes in queries
2014-07-09 13:15:03 +05:30
Anand Doshi
0c3bb75fd9
Added error_report_email in hooks
2014-07-09 12:59:56 +05:30
nabinhait
7e848b1924
Title mandatory in Note. Fixes #1913
2014-07-09 12:54:56 +05:30
nabinhait
8e4fcca216
Get query fixes in address in contact listing. Fixes #1911
2014-07-09 12:50:50 +05:30
nabinhait
fcfa42d992
Minor fixes #1917
2014-07-09 11:31:11 +05:30
nabinhait
5e0de79c0d
Account validated in general ledger report. Fixed #1912
2014-07-09 11:10:40 +05:30
Anand Doshi
8adb211216
Fixed patch: erpnext/patches/v4_1/fix_delivery_and_billing_status.py
2014-07-09 11:09:53 +05:30
nabinhait
5eea6f1b6d
Account validated in general ledger report. Fixed #1912
2014-07-09 11:08:59 +05:30
Rushabh Mehta
3f606b6c64
Update project.py
2014-07-09 09:27:02 +05:30
Rushabh Mehta
f31221d0d3
Changed raise Exception to frappe.throw
2014-07-09 09:13:00 +05:30
nabinhait
5220b462fd
Merge branch 'anandpdoshi-reapply-price-list' into develop
2014-07-08 16:03:53 +05:30
nabinhait
89b5e3e2ea
Set discount zero while fetching price list rate
2014-07-08 16:00:25 +05:30
nabinhait
ff2cc1626e
Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list
2014-07-08 15:30:25 +05:30
Anand Doshi
cf6d31cefc
Sales Order: Fixed test case
2014-07-07 18:46:02 +05:30
Anand Doshi
46d64849b4
Merge pull request #1902 from nabinhait/hotfix
...
Run trigger of company field on onload function, even if company exists
2014-07-07 18:08:51 +05:30
nabinhait
6c40079139
Update delivery and billing status in SO
2014-07-07 18:02:53 +05:30
nabinhait
2c0c66e756
Update delivery and billing status in SO
2014-07-07 17:56:25 +05:30
nabinhait
bc408d8d0b
Run trigger of company field on onload function, even if company exists
2014-07-07 17:56:24 +05:30
Anand Doshi
06cf2c7b51
Merge pull request #1903 from anandpdoshi/anand-july-7
...
Translations: Indonesian, Japanese and Russian
2014-07-07 17:44:04 +05:30
Anand Doshi
37f15ea664
Translations: Indonesian, Japanese and Russian
2014-07-07 17:26:51 +05:30
Anand Doshi
0da9060a80
Merge pull request #1900 from anandpdoshi/anand-july-7
...
Fix in Purchase Order and Re-order Item
2014-07-07 16:12:50 +05:30
Anand Doshi
e729516af7
Minor fix
2014-07-07 15:54:11 +05:30
Anand Doshi
4f0a42846c
Catch FiscalYearError in Re-order Item
2014-07-07 15:21:18 +05:30
Anand Doshi
484b092720
BugFix in Purchase Order: Validate minimum order qty using Qty in Stock UOM
2014-07-07 14:03:26 +05:30
Rushabh Mehta
ada6e5a5c4
Merge pull request #1899 from anandpdoshi/anand-july-7
...
BugFix: Maintenance Visit against Customer Issue
2014-07-07 13:57:59 +05:30
Anand Doshi
2cf256c6d0
Merge pull request #1898 from rmehta/pdf-etc
...
sales order status bugfix, add leading / in website_image and removed se...
2014-07-07 13:09:22 +05:30
Rushabh Mehta
58692fe4d1
sales order status bugfix, add leading / in website_image and removed send_print_in_body_and_attachment
2014-07-07 12:29:43 +05:30
Anand Doshi
3a389788bf
BugFix: Maintenance Visit against Customer Issue
...
+ Map Item details from Customer Issue into Maintenance Visit Purpose Table
+ Map Prev DocType and Prev DocName
+ Changed prevdoc_doctype and prevdoc_docname into Dynamic Link
2014-07-07 12:24:19 +05:30
Rushabh Mehta
47f26b0df4
Merge pull request #1896 from anandpdoshi/anand-july-7
...
BugFix: selling_controller.py
2014-07-07 11:50:54 +05:30
Anand Doshi
80a988c04f
BugFix: selling_controller.py
2014-07-07 11:35:54 +05:30
Anand Doshi
51f722d20f
Trigger Apply Price List on change of Currency Conversion Rate or Price List Currency Conversion Rate
2014-07-04 15:44:49 +05:30
Anand Doshi
dffec8fb85
Reapply Price List on Change
2014-07-04 15:44:48 +05:30
Anand Doshi
f9cae65df5
Merge pull request #1884 from nabinhait/hotfix
...
Hotfix
2014-07-04 15:31:15 +05:30
Rushabh Mehta
bcad536a90
Merge pull request #1883 from anandpdoshi/anand-july-3
...
Issues originating due to sql_mode='STRICT_ALL_TABLES'
2014-07-03 15:18:06 +05:30
Anand Doshi
d2f44006bd
Issues originating due to sql_mode='STRICT_ALL_TABLES'
...
Fixes frappe/frappe-bench#18
2014-07-03 14:32:21 +05:30
nabinhait
23cce731ab
Fixes in action, not defined if called from outside document class
2014-07-03 12:25:06 +05:30
Prakash Hodage
c01f4582de
Description removed for default cost center
2014-07-03 10:50:35 +05:30
Rushabh Mehta
0e085e15bb
Merge pull request #1881 from anandpdoshi/anand-wip
...
Fixes to end_of_life conditions
2014-07-02 18:16:54 +05:30
Anand Doshi
e673a664ac
Fixes to end_of_life conditions
2014-07-02 18:15:01 +05:30
Anand Doshi
57f76e936a
Merge pull request #1880 from rmehta/fixes-july-2
...
formatting fix in support ticket autoreply
2014-07-02 18:13:55 +05:30
Rushabh Mehta
501b2cc617
duplicate name fix for customer
2014-07-02 18:01:30 +05:30
Anand Doshi
843cdbe690
Merge pull request #1879 from anandpdoshi/anand-wip
...
Fixed Employee Birthday Report
2014-07-02 17:44:05 +05:30
Anand Doshi
df7f1c17ac
Fixed Employee Birthday Report
2014-07-02 17:35:00 +05:30
Anand Doshi
1601742092
Merge pull request #1878 from anandpdoshi/anand-wip
...
Automatic Outstanding Writeoff
2014-07-02 17:17:29 +05:30
Rushabh Mehta
6084a3e63a
formatting fix in support ticket autoreply
2014-07-02 17:13:08 +05:30
Anand Doshi
adfada707d
Automatic Outstanding Writeoff
2014-07-02 17:10:46 +05:30
Anand Doshi
e8533d15b3
Hotfix: Get Balance query
2014-07-01 19:46:22 +05:30
Anand Doshi
67721444b9
Merge pull request #1875 from rmehta/develop
...
status_updater.py
2014-07-01 18:50:25 +05:30
Rushabh Mehta
5f42276dbd
added patch for fixing sales order delivered qty
2014-07-01 18:42:59 +05:30
Rushabh Mehta
c53efc0d6c
fix status_updater - update delivery status in Sales Order from Sales Invoice
2014-07-01 18:42:30 +05:30
Rushabh Mehta
ddd2648c1e
fix travis, build website before tests
2014-07-01 18:42:30 +05:30
Rushabh Mehta
079e640b6b
Merge pull request #1876 from anandpdoshi/anand-wip
...
Fix JV Remarks
2014-07-01 18:35:13 +05:30
Anand Doshi
bc71f737b8
Fix JV Remarks
2014-07-01 18:12:26 +05:30
Anand Doshi
c33ae0c7df
Minor fix: commonified message.
2014-07-01 16:27:24 +05:30
Rushabh Mehta
e9f43251ab
Update journal_voucher.py
2014-07-01 15:19:15 +05:30
Rushabh Mehta
bc920dd2a5
Merge pull request #1868 from anandpdoshi/anand-wip
...
Fix comments
2014-07-01 12:34:17 +05:30
Anand Doshi
9398932c47
Merge pull request #1869 from nabinhait/v4-hotfix
...
Minor fix in authorization rule
2014-06-30 18:47:42 +05:30
Anand Doshi
da8adea0a9
Fixed customer test
2014-06-30 17:28:52 +05:30
Nabin Hait
669e789bc3
Minor fix in authorization rule
2014-06-30 17:15:52 +05:30
Anand Doshi
02cb347ac7
Fix comments after naming series records rename
2014-06-30 17:05:51 +05:30
Anand Doshi
0e72a87613
Improved test_rename: check if comments are also moved on rename
2014-06-30 17:05:51 +05:30
Anand Doshi
8ac4643fd7
Merge pull request #1867 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-30 13:20:49 +05:30
Rushabh Mehta
578a6db659
Merge pull request #1866 from anandpdoshi/anand-wip
...
Fixed get_sender for Sales and Jobs
2014-06-30 12:33:10 +05:30
Anand Doshi
4aa2380de2
Fixed get_sender for Sales and Jobs
2014-06-30 12:19:22 +05:30
Anand Doshi
2adf73cca1
Fixed requirements.txt
2014-06-30 12:18:08 +05:30
Anand Doshi
27b0d16422
Bumped to v4.1.0
2014-06-30 12:09:41 +05:30
Anand Doshi
c459fe21f8
Merge pull request #1865 from frappe/wip-4.1
...
Wip 4.1
2014-06-30 12:00:55 +05:30
Nabin Hait
6c7cd70202
Pricing rule condition if item group missing
2014-06-30 11:50:17 +05:30
Nabin Hait
606c601fc0
Make debit/credit note from sales/purchase return
2014-06-30 11:50:17 +05:30
Nabin Hait
7c9652997b
Item website specification from item group
2014-06-30 11:50:17 +05:30
Nabin Hait
4e4a83bcef
Fixes in maintenance schedule
2014-06-30 11:50:17 +05:30
Anand Doshi
7cac2884ae
Merge pull request #1862 from anandpdoshi/anand-wip-4.1
...
Fixes in Website Route system and other misc fixes
2014-06-30 11:30:30 +05:30
Anand Doshi
11ada53ed5
Fixes related to Website Route system and other misc fixes
2014-06-28 12:13:11 +05:30
Anand Doshi
5ba7ab0fed
Outgoing Mail Footer patch
2014-06-27 21:00:51 +05:30
Anand Doshi
ebcb654649
Minor: General Ledger Report - print format improvements
2014-06-27 20:53:13 +05:30
Nabin Hait
a46af033b9
Merge pull request #1860 from nabinhait/v4-hotfix
...
item query fixed in stock entry
2014-06-27 13:04:58 +05:30
Nabin Hait
a0a18d963d
item query fixed in stock entry
2014-06-27 13:04:22 +05:30
Anand Doshi
4105f324f7
Merge pull request #1858 from nabinhait/v4-hotfix
...
with_doc issue fixes
2014-06-26 16:16:35 +05:30
Nabin Hait
b7e91ee95e
with_doc issue fixes
2014-06-26 15:54:45 +05:30
Anand Doshi
f1af06c00d
Merge remote-tracking branch 'frappe/develop' into wip-4.1
2014-06-26 15:05:42 +05:30
Anand Doshi
779111d781
Merge pull request #1856 from nabinhait/v4-hotfix
...
V4 hotfix
2014-06-26 15:03:59 +05:30
Nabin Hait
3e6586f58d
minor fix
2014-06-26 14:56:47 +05:30
Nabin Hait
cf2632fe59
Fetch warehouse from pos settings
2014-06-26 13:05:10 +05:30
Anand Doshi
322f3caec6
Merge pull request #1854 from anandpdoshi/anand-wip-4.1
...
Changed System Signature to Footer
2014-06-26 12:59:08 +05:30
Anand Doshi
56198f40ac
Changed System Signature to Footer
2014-06-26 12:47:45 +05:30
Nabin Hait
4a1c897b2d
Select field options in serial no
2014-06-26 12:35:14 +05:30
Rushabh Mehta
2b62accee0
Merge pull request #1853 from anandpdoshi/anand-wip
...
Material Request: fixed series issue in insert_purchase_request
2014-06-26 12:31:17 +05:30
Rushabh Mehta
16e543e734
Merge pull request #1852 from anandpdoshi/anand-wip-4.1
...
Fixes frappe/erpnext#1849
2014-06-26 12:30:29 +05:30
Anand Doshi
1030af7b48
Material Request: fixed series issue in insert_purchase_request
2014-06-26 12:07:55 +05:30
Anand Doshi
7f41ff26fa
Fixes frappe/erpnext#1849
2014-06-26 12:02:55 +05:30
Rushabh Mehta
994f0c3d49
Merge pull request #1851 from nabinhait/v4-hotfix
...
Show Frozen field in account to all if Frozen Account Modifier is not sp...
2014-06-26 10:59:27 +05:30
Nabin Hait
500e1bc9b5
Show Frozen field in account to all if Frozen Account Modifier is not specified in Accounts Settings
2014-06-26 10:53:32 +05:30
Nabin Hait
23152f68f2
Merge pull request #1845 from nabinhait/v4-hotfix
...
V4 hotfix
2014-06-25 19:16:05 +05:30
Nabin Hait
00778c9a1e
Validate expense account for perpetual inventory
2014-06-25 19:12:24 +05:30
Nabin Hait
33a21ffbdc
Minor fixes in recurring invoice
2014-06-25 18:35:36 +05:30
Anand Doshi
5263b1a9c1
Merge remote-tracking branch 'frappe/develop' into wip-4.1
2014-06-25 17:06:51 +05:30
Anand Doshi
3fc1088d73
Merge branch 'rmehta-wip-4.1' into wip-4.1
2014-06-25 17:04:37 +05:30
Anand Doshi
d12be12f72
Fixed gantt chart query for Task
2014-06-25 16:57:51 +05:30
Anand Doshi
fda8858fc3
Warehouse query filtered by company
2014-06-25 16:57:50 +05:30
Nabin Hait
29de86253f
minor fixes
2014-06-25 16:57:50 +05:30
Nabin Hait
c7c89a5927
Cost center-wise net profit in financial analytics report
2014-06-25 16:57:50 +05:30
Nabin Hait
48f1142523
Fixed address deletion issue
2014-06-25 16:57:50 +05:30
Nabin Hait
9c2459658a
Fixes for recurring invoice
2014-06-25 16:57:50 +05:30
Anand Doshi
ca37ff8b08
Fix in pricing rule patch
2014-06-25 16:57:50 +05:30
Nabin Hait
e6440a75b5
Allowed renaming for project
2014-06-25 16:57:50 +05:30
Nabin Hait
2b400dc2ad
stock entry incoming rate based on precision
2014-06-25 16:57:49 +05:30
Nabin Hait
860b2e2bbb
Fixes in pricing rule
2014-06-25 16:57:49 +05:30
Nabin Hait
f27fa5cbf3
Fixes in pricing rule
2014-06-25 16:57:49 +05:30
Nabin Hait
98bec6f96b
Fixes in pricing rule
2014-06-25 16:57:49 +05:30
Nabin Hait
379d86f9a3
sms sending issue fixed
2014-06-25 16:57:49 +05:30
Anand Doshi
8b2dfcff29
Naming Series Property Setter Patch
2014-06-25 16:57:49 +05:30
Nabin Hait
b569930b2a
Made warehouse and selling pricing list non-mandatory in pos setting
2014-06-25 16:57:48 +05:30
Nabin Hait
061c9744af
Set status button in serial no
2014-06-25 16:57:48 +05:30
Nabin Hait
43616619ec
Set status button in serial no
2014-06-25 16:57:48 +05:30
Nabin Hait
838aeb149f
minor fix in sales invoice
2014-06-25 16:57:48 +05:30
Rushabh Mehta
37f809a1f4
fix end of life query for item
2014-06-25 16:57:48 +05:30
Rushabh Mehta
32303daf63
fixes to bom.js
2014-06-25 16:57:48 +05:30
Anand Doshi
d709f4dfdd
Naming Series property type as Text
2014-06-25 16:57:47 +05:30
Nabin Hait
80142af9b8
Minor fixes
2014-06-25 16:57:47 +05:30
Nabin Hait
1b1b3a8fd6
validate pricing rule discount with item max discount
2014-06-25 16:57:47 +05:30
Nabin Hait
afffd656f6
Reload pricing rule in patch
2014-06-25 16:57:47 +05:30
Nabin Hait
4f6e31eb08
validate pricing rule discount with item max discount
2014-06-25 16:57:47 +05:30
Nabin Hait
9daca108b3
Pricing Rule fixes and improvements. Fixes #1795
2014-06-25 16:57:47 +05:30
Anand Doshi
de5e397fd4
Inventory Accounting: Cost Center only required for Expense Account
2014-06-25 16:57:46 +05:30
Anand Doshi
f5ec92c79a
Validate Select field values
2014-06-25 16:57:46 +05:30
Anand Doshi
f654fea736
Fixed feed type options
2014-06-25 16:57:08 +05:30
Anand Doshi
daa56ca50f
Fixed number format in currency
2014-06-25 16:57:08 +05:30
Anand Doshi
c20de7b264
Minor fix in Journal Voucher
2014-06-25 16:57:07 +05:30
Nabin Hait
c5e813f9f4
Overwrite from POS Settings if value exists
2014-06-25 16:57:07 +05:30
Nabin Hait
3b7dd0396f
Get party details fixes
2014-06-25 16:57:07 +05:30
Nabin Hait
c226292d8e
Stocvk entry incoming rate for sales return
2014-06-25 16:57:07 +05:30
Nabin Hait
216e5bb208
Incoming rate for sales return
2014-06-25 16:57:07 +05:30
Nabin Hait
afdc0a5f59
Valuation rate and amount for fg item
2014-06-25 16:57:07 +05:30
Anand Doshi
5a9e00ce71
Fixed Employee Leave Balance Report
2014-06-25 16:57:07 +05:30
Anand Doshi
ca3d60c160
Fixed Sales Order -> Delivery Note mapping of address fields
2014-06-25 16:57:06 +05:30
Anand Doshi
222b7b660e
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-25 16:57:06 +05:30
Anand Doshi
a469954ef3
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
...
This reverts commit 297939325a .
2014-06-25 16:57:06 +05:30
Anand Doshi
be1d11f98d
Travis: Install frappe of targetted branch
...
For example:
If pull request is for wip-4.1 branch of erpnext, install frappe with branch as wip-4.1
2014-06-25 16:57:05 +05:30
Anand Doshi
457515fc08
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-25 16:57:05 +05:30
Anand Doshi
e3ac8dd5a8
Don't set default for warehouse when creating serial no
2014-06-25 16:57:05 +05:30
Anand Doshi
14920b447c
Fixed Currency Exchange error
2014-06-25 16:57:04 +05:30
Nabin Hait
0c6177dd9a
Patch: update users report view settings for rename fields
2014-06-25 16:57:04 +05:30
Nabin Hait
cea571fc31
Fixes in fetching valuation rate in stock entry
2014-06-25 16:57:03 +05:30
Nabin Hait
d5a4c871f2
Field renamed in sms center
2014-06-25 16:57:02 +05:30
Nabin Hait
7c6c2e0ccf
Do not make packing list after submission
2014-06-25 16:57:02 +05:30
Rushabh Mehta
476d1fb334
Update sms_center.json
...
changed total words to total characters
2014-06-25 16:57:01 +05:30
Rushabh Mehta
7ca3be57df
Merge pull request #1844 from anandpdoshi/anand-wip
...
Serial No Validation in Stock Entry, Warehouse query fix
2014-06-25 16:05:17 +05:30
Anand Doshi
d1419edfd0
Merge remote-tracking branch 'frappe/develop' into wip-4.1
2014-06-25 15:25:48 +05:30
Anand Doshi
a740f750c7
Stock Entry: Serial No Mandatory when purpose in Material Transfer, Sales Return, Purchase Return
2014-06-25 13:31:02 +05:30
Anand Doshi
610a405c85
Fix in warehouse query
2014-06-25 13:30:26 +05:30
Rushabh Mehta
aa1edfb6ae
Merge pull request #1842 from anandpdoshi/anand-wip
...
Warehouse query filtered by Company, Fixed Gantt Chart query for task
2014-06-25 10:18:35 +05:30
Anand Doshi
4864c9e96a
Fixed gantt chart query for Task
2014-06-24 18:53:17 +05:30
Anand Doshi
faefeaa644
Warehouse query filtered by company
2014-06-24 18:53:04 +05:30
Anand Doshi
e0a7ff77df
Merge pull request #1838 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-24 17:37:39 +05:30
Nabin Hait
60c48fee16
minor fixes
2014-06-24 17:34:52 +05:30
Anand Doshi
1ef3dbabfc
Merge pull request #1837 from anandpdoshi/anand-wip
...
Fix in pricing rule patch
2014-06-24 17:11:29 +05:30
Nabin Hait
0b15755441
Cost center-wise net profit in financial analytics report
2014-06-24 17:02:45 +05:30
Nabin Hait
e9b95bbfe8
Fixed address deletion issue
2014-06-24 16:35:00 +05:30
Nabin Hait
d0bf91d639
Fixes for recurring invoice
2014-06-24 16:19:16 +05:30
Anand Doshi
a1be6021c4
Fix in pricing rule patch
2014-06-24 15:26:40 +05:30
Nabin Hait
21efc93e54
Allowed renaming for project
2014-06-24 12:44:49 +05:30
Nabin Hait
fdf38dab6f
stock entry incoming rate based on precision
2014-06-24 12:42:36 +05:30
Rushabh Mehta
5dfacf2615
Merge pull request #1834 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-24 12:09:12 +05:30
Nabin Hait
613d784cfb
Fixes in pricing rule
2014-06-24 12:07:56 +05:30
Nabin Hait
efd426650d
Fixes in pricing rule
2014-06-24 11:11:08 +05:30
Nabin Hait
f62b75c731
Fixes in pricing rule
2014-06-24 11:00:13 +05:30
Nabin Hait
65efd0a9a1
sms sending issue fixed
2014-06-23 18:21:37 +05:30
Anand Doshi
f08881a2b7
Merge pull request #1831 from anandpdoshi/anand-wip
...
Naming Series Property Setter Patch
2014-06-23 18:15:01 +05:30
Anand Doshi
83da92fdcc
Naming Series Property Setter Patch
2014-06-23 18:04:07 +05:30
Nabin Hait
16fa6472b3
Made warehouse and selling pricing list non-mandatory in pos setting
2014-06-23 16:42:36 +05:30
Anand Doshi
6781f62c70
Merge pull request #1828 from rmehta/develop
...
item query fix
2014-06-23 15:53:38 +05:30
Anand Doshi
a445c39901
Merge pull request #1829 from nabinhait/v4-hotfix
...
V4 hotfix
2014-06-23 15:52:54 +05:30
Nabin Hait
da490e3f53
Set status button in serial no
2014-06-23 15:51:03 +05:30
Nabin Hait
ccd2e2496c
Merge pull request #1827 from anandpdoshi/anand-wip
...
Naming Series property type as Text
2014-06-23 15:44:29 +05:30
Nabin Hait
36da171a3d
Set status button in serial no
2014-06-23 15:36:31 +05:30
Nabin Hait
e84f8b23aa
minor fix in sales invoice
2014-06-23 15:36:30 +05:30
Rushabh Mehta
864d1ea87f
fix end of life query for item
2014-06-23 12:20:39 +05:30
Rushabh Mehta
58ff651c6d
fixes to bom.js
2014-06-23 12:20:39 +05:30
Anand Doshi
c027563b13
Merge pull request #1826 from nabinhait/v4-hotfix
...
V4 hotfix
2014-06-20 20:44:17 +05:30
Anand Doshi
f0a1735ac8
Naming Series property type as Text
2014-06-20 20:19:51 +05:30
Nabin Hait
56f6d01757
Minor fixes
2014-06-20 19:37:53 +05:30
Nabin Hait
3c946b2a72
validate pricing rule discount with item max discount
2014-06-20 19:07:44 +05:30
Nabin Hait
1d37698d4c
Reload pricing rule in patch
2014-06-20 16:30:44 +05:30
Nabin Hait
be50c289f8
validate pricing rule discount with item max discount
2014-06-20 16:19:55 +05:30
Nabin Hait
444f956e7b
Pricing Rule fixes and improvements. Fixes #1795
2014-06-20 16:00:45 +05:30
Rushabh Mehta
b35d84156f
Merge pull request #1822 from anandpdoshi/anand-wip
...
Inventory Accounting: Cost Center only required for Expense Account
2014-06-20 11:24:45 +05:30
Anand Doshi
496123a646
Inventory Accounting: Cost Center only required for Expense Account
2014-06-19 19:25:19 +05:30
Anand Doshi
861747ec26
Merge remote-tracking branch 'frappe/develop' into wip-4.1
2014-06-19 17:44:33 +05:30
Anand Doshi
7bbaf0298e
Merge pull request #1821 from nabinhait/v4-hotfix
...
Overwrite from POS Settings if value exists
2014-06-19 16:48:53 +05:30
Rushabh Mehta
a2f5a7f3cd
Merge pull request #1820 from anandpdoshi/anand-wip
...
Validate Select Fields
2014-06-19 16:32:50 +05:30
Anand Doshi
a5cfc59d81
Validate Select field values
2014-06-19 16:05:08 +05:30
Anand Doshi
da342c7855
Fixed feed type options
2014-06-18 21:09:19 +05:30
Anand Doshi
aecddefbc8
Fixed number format in currency
2014-06-18 20:55:39 +05:30
Anand Doshi
fd05f458e1
Minor fix in Journal Voucher
2014-06-18 20:55:18 +05:30
Nabin Hait
faf176d78c
Overwrite from POS Settings if value exists
2014-06-18 19:52:24 +05:30
Rushabh Mehta
151125e537
fixed for travis
2014-06-18 17:33:01 +05:30
Anand Doshi
64a0eb42ed
Merge pull request #1816 from nabinhait/v4-hotfix
...
Stock Entry incoming rate
2014-06-18 17:32:04 +05:30
Nabin Hait
ba6cc2864a
Merge pull request #1817 from anandpdoshi/anand-wip
...
Fixed Employee Leave Balance Report
2014-06-18 17:18:26 +05:30
Nabin Hait
4d7c4fc0f4
Get party details fixes
2014-06-18 16:40:59 +05:30
Nabin Hait
e7c2f74a07
Stocvk entry incoming rate for sales return
2014-06-18 16:40:59 +05:30
Nabin Hait
a7da6e1480
Incoming rate for sales return
2014-06-18 16:40:59 +05:30
Nabin Hait
ae0d753cad
Valuation rate and amount for fg item
2014-06-18 16:40:59 +05:30
Anand Doshi
31c977b906
Fixed Employee Leave Balance Report
2014-06-18 16:26:45 +05:30
Nabin Hait
87179346d4
Merge pull request #1814 from anandpdoshi/anand-wip
...
Don't set warehouse when creating serial no, fixed currency exchange error message
2014-06-18 16:00:53 +05:30
Anand Doshi
d768afb80b
Fixed Sales Order -> Delivery Note mapping of address fields
2014-06-18 15:23:25 +05:30
Anand Doshi
de12a0941f
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-18 14:05:29 +05:30
Anand Doshi
987a28fc6a
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
...
This reverts commit 297939325a .
2014-06-18 14:05:08 +05:30
Anand Doshi
c5dbf0f8ad
Travis: Install frappe of targetted branch
...
For example:
If pull request is for wip-4.1 branch of erpnext, install frappe with branch as wip-4.1
2014-06-18 13:35:37 +05:30
Anand Doshi
297939325a
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-18 13:10:10 +05:30
Anand Doshi
2f800521cb
Don't set default for warehouse when creating serial no
2014-06-18 12:48:46 +05:30
Anand Doshi
72a178a37e
Fixed Currency Exchange error
2014-06-18 12:14:17 +05:30
Anand Doshi
8c7b4549ed
Merge pull request #1812 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-18 10:59:05 +05:30
Nabin Hait
91090042d1
Patch: update users report view settings for rename fields
2014-06-18 10:29:53 +05:30
Nabin Hait
0693937c1e
Fixes in fetching valuation rate in stock entry
2014-06-18 10:20:01 +05:30
Nabin Hait
ac1a4ed576
Field renamed in sms center
2014-06-18 10:20:01 +05:30
Nabin Hait
b73d3f925d
Do not make packing list after submission
2014-06-18 10:18:50 +05:30
Rushabh Mehta
69641ddc36
Update sms_center.json
...
changed total words to total characters
2014-06-18 09:04:09 +05:30
Rushabh Mehta
36881807ed
Merge branch 'wip-4.2' into wip-4.1
2014-06-17 17:36:22 +05:30
Rushabh Mehta
1a18b427a8
make font size smaller for erpnext powered
2014-06-17 16:54:55 +05:30
Rushabh Mehta
69ce97b80a
added print format for general ledger
2014-06-17 16:54:55 +05:30
Rushabh Mehta
9f887b436c
fixes new routing, for frappe/frappe#600
2014-06-17 16:53:44 +05:30
Anand Doshi
5780163fb7
Merge remote-tracking branch 'frappe/develop' into wip-4.1
2014-06-17 14:58:18 +05:30
Anand Doshi
1c5fb9495e
Merge pull request #1806 from nabinhait/v4-hotfix
...
Fixes
2014-06-17 14:54:44 +05:30
Rushabh Mehta
5df521bad5
updated generators for wip-4.2
2014-06-17 14:21:26 +05:30
Nabin Hait
be75d0265b
Merge pull request #1805 from anandpdoshi/anand-wip
...
Sales Invoice List: show percent paid as 100% if grand total is 0
2014-06-17 14:12:26 +05:30
Anand Doshi
b20de6a3ec
Sales Invoice List: show percent paid as 100% if grand total is 0
2014-06-17 13:58:06 +05:30
Nabin Hait
4ee8704b99
Fixes in financial analytics
2014-06-17 13:52:03 +05:30
Nabin Hait
d2e8a0a96a
Delivery note update after submission
2014-06-17 12:55:52 +05:30
Anand Doshi
ff367c7b31
Merge pull request #1798 from nabinhait/v4-hotfix
...
Account common get_query
2014-06-16 16:04:32 +05:30
Nabin Hait
98d9d797fd
Tax category validation ignored in material request
2014-06-16 15:54:05 +05:30
Nabin Hait
a6fc3f6337
Ignore pricing rule for material request
2014-06-16 15:34:52 +05:30
Nabin Hait
539f352318
Delivery note to packing slip mapping
2014-06-16 15:03:36 +05:30
Nabin Hait
e1b2b3e995
Account common get_query
2014-06-16 15:03:36 +05:30
Rushabh Mehta
3b7bcf0f4f
make font size smaller for erpnext powered
2014-06-16 14:21:37 +05:30
Rushabh Mehta
03ae32d937
added print format for general ledger
2014-06-16 14:21:37 +05:30
Anand Doshi
ccf370f813
Fixed item query
2014-06-16 13:50:11 +05:30
Anand Doshi
0521814dea
Fixed item query
2014-06-16 13:25:20 +05:30
Anand Doshi
e35841a2ea
Reload Shopping Cart Settings in create price list patch
2014-06-16 12:59:54 +05:30
Anand Doshi
3474c273a5
Ignore mandatory in employee patch
2014-06-16 12:14:21 +05:30
Anand Doshi
3dc722b096
Create price list only if setup complete
2014-06-13 15:30:38 +05:30
Rushabh Mehta
5002a6467d
Merge pull request #1793 from anandpdoshi/anand-wip
...
Create price list if missing
2014-06-13 13:20:46 +05:30
Anand Doshi
c1bfb63d96
Create price list if missing
2014-06-13 12:41:08 +05:30
Anand Doshi
27e295a4cb
Merge pull request #1789 from nabinhait/v4-hotfix
...
V4 hotfix
2014-06-12 15:39:58 +05:30
Rushabh Mehta
99703a95c2
Merge pull request #1790 from anandpdoshi/wip-anand
...
Fixes split email settings, removed clear custom buttons, pos view switch
2014-06-12 15:25:03 +05:30
Nabin Hait
f2202fc014
minor fix
2014-06-12 15:20:47 +05:30
Anand Doshi
3761ff3522
Fix in patch: split email settings
2014-06-12 15:00:52 +05:30
Anand Doshi
205438669a
Removed clear_custom_buttons, pos view switch fix
2014-06-12 15:00:51 +05:30
Nabin Hait
e7f2d3179d
update other_charges in custom print formats
2014-06-12 14:58:09 +05:30
Anand Doshi
277f4a1bfe
Removed clear_custom_buttons, pos view switch fix
2014-06-12 12:59:23 +05:30
Nabin Hait
46dc3b1442
validations added in stock entry
2014-06-12 12:48:28 +05:30
Nabin Hait
2128c98c35
available qty validation. Fixes #1045
2014-06-12 12:42:22 +05:30
Nabin Hait
e98b326ba3
Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932
2014-06-12 12:25:23 +05:30
Rushabh Mehta
7bcd31bddb
Merge pull request #1785 from rmehta/develop
...
minor fix for outgoing communication email
2014-06-12 10:32:21 +05:30
Rushabh Mehta
6def968c3c
minor fix for outgoing communication email
2014-06-12 10:31:43 +05:30
Nabin Hait
f2ee3cec19
Merge pull request #1784 from nabinhait/v4-hotfix
...
Minor fixes in salary manager. Fixes #1754
2014-06-12 10:19:27 +05:30
Nabin Hait
589a298096
Minor fixes in salary manager. Fixes #1754
2014-06-11 13:00:31 +05:30
Rushabh Mehta
94c17bdf85
Update CONTRIBUTING.md
2014-06-11 10:45:57 +05:30
Anand Doshi
fdfea0c17b
Fixed Recurring Sales Invoice
2014-06-10 17:54:04 +05:30
Anand Doshi
862fe60368
Minor fix in newsletter
2014-06-10 17:15:50 +05:30
Nabin Hait
6a3e97a9f8
Merge pull request #1781 from anandpdoshi/hotfix
...
Reload sales taxes and charges in patch
2014-06-10 16:37:59 +05:30
Anand Doshi
7656377f3f
Show website route for generator via set_intro, fix in Support Email Settings
2014-06-10 15:48:37 +05:30
Anand Doshi
82029be6f9
Reload sales taxes and charges in patch
2014-06-10 14:52:49 +05:30
Anand Doshi
339f75eb53
Merge pull request #1780 from nabinhait/v4-hotfix
...
minor fix in global defaults
2014-06-10 14:36:29 +05:30
Nabin Hait
7425634692
minor fix in global defaults
2014-06-10 14:12:28 +05:30
Anand Doshi
38d5407ea1
Merge pull request #1779 from nabinhait/v4-hotfix
...
Fixes
2014-06-10 11:40:26 +05:30
Nabin Hait
6febfca5a6
changed insert after for india related custom fields
2014-06-10 11:21:38 +05:30
Nabin Hait
7cba72a0b7
Pricing Rule: price / discount percentage can not be negative
2014-06-10 11:09:21 +05:30
Anand Doshi
fb6c003c97
Merge pull request #1778 from nabinhait/v4-hotfix
...
update custom print formats for renamed fields
2014-06-10 10:43:51 +05:30
Nabin Hait
91016ba989
update custom print formats for renamed fields
2014-06-10 10:41:37 +05:30
Nabin Hait
2aaf1de7fe
Merge pull request #1777 from anandpdoshi/hotfix
...
Default Letterhead, Item wise Price List Rate
2014-06-09 18:52:28 +05:30
Anand Doshi
b527e54809
Fixed report: Item wise Price List Rate
2014-06-09 18:08:46 +05:30
Anand Doshi
c01db5fe9c
Save default letterhead
2014-06-09 18:01:14 +05:30
Anand Doshi
534ebde638
Merge pull request #1775 from nabinhait/v4-hotfix
...
create custom fields for india specific fields
2014-06-09 16:23:21 +05:30
Nabin Hait
d532d2f64f
create custom fields for india specific fields
2014-06-09 16:00:49 +05:30
Nabin Hait
7bcd69e157
Merge pull request #1774 from anandpdoshi/hotfix
...
Also save Global Defaults in System Settings patch
2014-06-09 15:52:03 +05:30
Anand Doshi
af63d053b1
Also save Global Defaults in System Settings patch
2014-06-09 15:51:12 +05:30
Nabin Hait
d9ff118b40
Merge pull request #1771 from anandpdoshi/hotfix
...
Fix in HR patch
2014-06-09 15:33:14 +05:30
Anand Doshi
be3f914acd
Fixed add address template
2014-06-09 15:18:45 +05:30
Anand Doshi
edb9efd9a6
Fixed manifest and website
2014-06-09 15:11:18 +05:30
Anand Doshi
cdfa9a371d
Export perm for GL Entry and Stock Ledger Entry
2014-06-09 15:11:17 +05:30
Anand Doshi
390efdc884
Fix in HR patch
2014-06-09 15:04:00 +05:30
Anand Doshi
ac276a27b7
Merge pull request #1772 from nabinhait/v4-hotfix
...
Update tax amount after discount in existing documents
2014-06-09 14:04:15 +05:30
Nabin Hait
b63e99eb43
Update tax amount after discount in existing documents
2014-06-09 12:49:09 +05:30
Anand Doshi
00976cfe47
Merge pull request #1768 from anandpdoshi/hotfix
...
Fixed HR patch
2014-06-06 22:11:39 +05:30
Anand Doshi
6f561aa846
Fixed HR patch
2014-06-06 22:10:18 +05:30
Anand Doshi
276386c94a
Merge pull request #1765 from anandpdoshi/hotfix
...
Fixed Purchase Receipt qty trigger
2014-06-06 20:39:52 +05:30
Anand Doshi
0aa125304d
Fixed Reset Permissions patch
2014-06-06 20:39:21 +05:30
Anand Doshi
482d29dc53
Fixed Purchase Receipt qty trigger
2014-06-06 20:34:08 +05:30
Anand Doshi
cd0aed993a
Fixed Address Template Patch
2014-06-06 17:37:31 +05:30
Anand Doshi
f56656f6b4
Merge pull request #1763 from anandpdoshi/hotfix
...
Fixed address template and changed case
2014-06-06 17:20:57 +05:30
Anand Doshi
fc601659f5
Fixed Address Template
2014-06-06 17:07:50 +05:30
Anand Doshi
4a069a1e7f
Changed case in modules.txt
2014-06-06 16:28:03 +05:30
Anand Doshi
04badf7e6e
Hotfix: module name case for HR
2014-06-06 15:29:55 +05:30
Rushabh Mehta
0b31a163a3
Merge pull request #1761 from anandpdoshi/hotfix
...
Improved FIscal Year Error Messages, Reset Permissions for some DocTypes
2014-06-06 15:20:07 +05:30
Anand Doshi
171c00cfd6
Reload permissions for master and setting documents
2014-06-06 15:13:20 +05:30
Anand Doshi
b5cefa92fa
Improved Fiscal Year validation messages
2014-06-06 15:10:00 +05:30
Anand Doshi
8cead48342
Merge pull request #1756 from rmehta/develop
...
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-06 14:52:22 +05:30
Rushabh Mehta
1989e4fca0
Merge pull request #1755 from nabinhait/v4-hotfix
...
Fixes in trends report
2014-06-06 12:49:34 +05:30
Rushabh Mehta
880b3ef6c0
added qty updating option multi-item selector
2014-06-06 11:45:30 +05:30
Anand Doshi
2ec93590e4
Minor fix in address template
2014-06-06 11:45:30 +05:30
Anand Doshi
5fe69fb556
Fixes
2014-06-06 11:45:29 +05:30
Anand Doshi
290ed09dc6
Update new_address_template.py
2014-06-06 11:45:29 +05:30
Anand Doshi
65018daebc
Minor fix in address template
2014-06-05 18:33:26 +05:30
Rushabh Mehta
0739937fa2
bug: added empty class for sms settings
2014-06-05 18:15:00 +05:30
Anand Doshi
ede8ea52b0
Fixes
2014-06-05 18:06:20 +05:30
Rushabh Mehta
ba83e9cfbe
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-05 17:56:42 +05:30
Nabin Hait
977331806b
Set missing values only in unsubmitted documents
2014-06-05 17:55:00 +05:30
Nabin Hait
86207afe15
Set missing values only in unsubmitted documents
2014-06-05 17:55:00 +05:30
Nabin Hait
704a453b7a
Set missing values only in unsubmitted documents
2014-06-05 17:55:00 +05:30
Nabin Hait
b7438894f6
Fixes in trends report
2014-06-05 17:55:00 +05:30
Anand Doshi
4022586015
Update new_address_template.py
2014-06-05 17:34:59 +05:30
Anand Doshi
26fcef69c7
Merge pull request #1753 from rmehta/develop
...
Address Template
2014-06-05 16:28:10 +05:30
Rushabh Mehta
5036706f81
removed address_title from address and removed test
2014-06-05 16:16:13 +05:30
Rushabh Mehta
c02fbd22fa
removed address_title from address and removed test
2014-06-05 16:16:13 +05:30
Rushabh Mehta
33020a63b8
patch for address template fixes #1749
2014-06-05 16:16:13 +05:30
Rushabh Mehta
eaa2e55d20
patch for address template fixes #1749
2014-06-05 16:16:13 +05:30
Rushabh Mehta
c22e11d483
added address template:
2014-06-05 16:01:55 +05:30
Rushabh Mehta
41471c3b44
fixed description in salary manager
2014-06-05 16:01:55 +05:30
Anand Doshi
17e7538937
Merge pull request #1746 from nabinhait/v4-hotfix
...
Multiple issues
2014-06-05 15:27:57 +05:30
Nabin Hait
c8be8ba42c
function renamed
2014-06-05 15:18:10 +05:30
Nabin Hait
4d4df03f88
Added total debit / credit row in trial balance. Fixes #1313
2014-06-04 19:00:57 +05:30
Nabin Hait
deb6e06336
minor fix
2014-06-04 19:00:56 +05:30
Nabin Hait
c3d1d6a946
cleanup raw materials supplied table for sub-contraction. Fixes #1743
2014-06-04 19:00:56 +05:30
Nabin Hait
1055139c83
get accounts for opening entry
2014-06-04 19:00:56 +05:30
Nabin Hait
19d1e499c3
Removed Purchase in transit report #1435
2014-06-04 19:00:56 +05:30
Nabin Hait
b161eea793
Account balance must be debit / credit, validate if balance already in credit / debit. Fixes #1442
2014-06-04 18:57:53 +05:30
Anand Doshi
8fbe4b9c3b
Merge pull request #1747 from anandpdoshi/apply_user_permissions
...
Apply user permissions
2014-06-04 18:38:25 +05:30
Anand Doshi
85479bcbc0
Fixes for apply user permissions and momentjs
2014-06-04 18:15:43 +05:30
Anand Doshi
ec8240e890
Apply User Permissions optional in Script and Query Reports
2014-06-04 17:48:58 +05:30
Anand Doshi
221dec8cac
transaction.js: calculate only if one entry in table
2014-06-04 17:48:57 +05:30
Anand Doshi
9a0f6f5bb4
Enable Scheduler in System Settings when Setup Wizard is completed
2014-06-04 17:48:57 +05:30
Anand Doshi
38dedf402b
Fixes in patches for migration
2014-06-04 17:48:56 +05:30
Anand Doshi
c280d0655c
Set Employee Name if missing
2014-06-04 17:48:56 +05:30
Anand Doshi
cdc1b640d9
Fixes in user permissions patches
2014-06-04 17:48:56 +05:30
Anand Doshi
37993dd713
Romanian and Korean Translations
2014-06-04 17:48:55 +05:30
Anand Doshi
cd25301607
Translations
2014-06-04 17:48:55 +05:30
Anand Doshi
4985691617
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
69eec9e344
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635
Permission relogication continued
2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7
Started permission relogication
2014-06-04 17:48:52 +05:30
Anand Doshi
ffc28faa51
Merge pull request #1744 from rmehta/develop
...
added multiple item select and allow non purchase items in Material Requ...
2014-06-04 17:47:58 +05:30
Rushabh Mehta
b6843f2087
added multiple item select and allow non purchase items in Material Request of type transfer
2014-06-04 13:10:41 +05:30
Anand Doshi
3f6606acdb
Merge pull request #1702 from pdvyas/put-version-in-file
...
keep version in separate file
2014-06-04 12:28:37 +05:30
Anand Doshi
7a3885863c
Merge pull request #1740 from nabinhait/v4-hotfix
...
fixes
2014-06-04 11:56:42 +05:30
Nabin Hait
67d8b91690
Fixes in bank reconciliation statement
2014-06-04 11:18:25 +05:30
Nabin Hait
ce6977ffe6
Minor fixes in fetching item details
2014-06-03 23:02:02 +05:30
Nabin Hait
bc7efa6da6
Parent account mandatory for all non-root accounts
2014-06-03 23:02:02 +05:30
Anand Doshi
9198444a3b
Merge pull request #1737 from nabinhait/v4-hotfix
...
Grid report translations and closing balance in trial balance
2014-06-03 14:40:26 +05:30
Nabin Hait
b15764ef2c
Translation issue fixed in analytics/grid report
2014-06-03 13:02:39 +05:30
Nabin Hait
abb62c76d8
Removed allocated to field from serach fields in support ticket
2014-06-03 10:50:55 +05:30
Nabin Hait
51b7f322cc
Closing balance fixes in trial balance. Fixes #1730
2014-06-02 18:47:46 +05:30
Anand Doshi
be99b1240c
Merge pull request #1722 from nabinhait/v4-hotfix
...
multiple fixes
2014-06-02 11:09:32 +05:30
Anand Doshi
315e3b563b
Merge pull request #1725 from rmehta/develop
...
Fix for awesome bar
2014-06-02 11:07:26 +05:30
Rushabh Mehta
430d132ee0
awesomebar: add tree links
2014-05-31 10:36:42 +05:30
Rushabh Mehta
cc37cc83cd
removed section_style
2014-05-31 10:36:41 +05:30
Nabin Hait
0984f227a8
minor fixes related to path
2014-05-30 19:10:12 +05:30
Nabin Hait
548cf96c44
Minor fixes in sales return
2014-05-30 19:09:59 +05:30
Nabin Hait
0be378af6a
Purchase ordered qty can not be less than minimum order qty. fixes #1529
2014-05-30 15:53:20 +05:30
Nabin Hait
fb988ba834
Salary Slip: pull details from salary struture. fixes #1719
2014-05-30 15:53:20 +05:30
Nabin Hait
e6ddd28067
Don't execute reorder_item, if initial setup not completed. fixes #1668
2014-05-30 15:53:20 +05:30
Nabin Hait
0acd3159db
Merge pull request #1718 from nabinhait/v4-hotfix
...
Remove blank lines from uploaded file of attendance
2014-05-30 14:33:59 +05:30
Nabin Hait
1897e75894
Remove blank lines from uploaded file of attendance #1714
2014-05-30 14:31:10 +05:30
Anand Doshi
852e7cdb41
Merge pull request #1691 from nabinhait/v4-hotfix
...
build_filter_conditions and pricing rules
2014-05-30 11:51:36 +05:30
Nabin Hait
c1367d9d10
minor fixes
2014-05-30 11:43:00 +05:30
Nabin Hait
cb9bdf43f6
over billing validation fixed
2014-05-30 11:22:16 +05:30
Nabin Hait
6b1a8e0a40
minor fixes
2014-05-30 11:22:16 +05:30
Nabin Hait
7f32cbeb06
Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials #1688
2014-05-30 11:22:15 +05:30
Nabin Hait
c7253b3a37
Get valuation rate for fg item base don issued item cost + operation cost. #1688
2014-05-30 11:22:15 +05:30
Nabin Hait
7f03e24c55
Valuation rate of raw materials in BOM. #1688
2014-05-30 11:22:15 +05:30
Nabin Hait
66cecf4824
uom trigger issue in stock entry fixes #1712
2014-05-30 11:22:15 +05:30
Nabin Hait
f3552ca737
packing slip fixes #1711
2014-05-30 11:22:15 +05:30
Nabin Hait
3dc6a80198
deleted delivery note packing list wise print format
2014-05-30 11:22:14 +05:30
Nabin Hait
e71159d6ea
Standard Rate field removed from item. Fixes #1688
2014-05-30 11:22:14 +05:30
Nabin Hait
732a7e81a0
Incoming rate in stock ledger and valuation rate in stock balance report. Fixes #1706
2014-05-30 11:22:14 +05:30
Nabin Hait
c3cbe2a30c
minor fixes in sales invoice validation
2014-05-30 11:22:13 +05:30
Nabin Hait
9bc9b8795b
Fixes in stock reconciliation
2014-05-30 11:22:13 +05:30
Nabin Hait
d0605443fb
removed print statement
2014-05-30 11:22:13 +05:30
Nabin Hait
47a8670d37
pricing rule testcase fixes
2014-05-30 11:22:12 +05:30
Nabin Hait
e7546e2305
SMS Settings added in setup and selling module page. Fixes #1693
2014-05-30 11:22:12 +05:30
Nabin Hait
ccb9826afd
pricing list tets case fixes
2014-05-30 11:22:12 +05:30
Nabin Hait
8de61559b0
Minor fixes in sales / purchase analytics. Fixes #1701
2014-05-30 11:22:11 +05:30
Nabin Hait
ea4aa04cc4
Search query for account cleanup
2014-05-30 11:22:11 +05:30
Nabin Hait
a3dd72a759
Pricing Rule
2014-05-30 11:22:10 +05:30
Nabin Hait
62ec60188b
use build_filter_conditions from db_query. Fixes #1679
2014-05-30 11:22:10 +05:30
Anand Doshi
10cb4799bc
Merge pull request #1700 from rmehta/develop
...
Various UI Bug Fixes
2014-05-30 11:12:21 +05:30
Pratik Vyas
8e0438bad4
keep version in separate file
2014-05-28 16:58:55 +05:30
Pratik Vyas
76e48b5c3f
hotfix: update_account_root_type.py patch
2014-05-28 15:22:34 +05:30
Rushabh Mehta
1bf9df7c85
removed about
2014-05-28 13:15:32 +05:30
Anand Doshi
32063bb472
Removed designation 'Director' owing to problems with Greek translation
2014-05-27 22:40:53 +05:30
Rushabh Mehta
f944e819e9
fixes #1581 and added icons to grid reports
2014-05-27 15:22:04 +05:30
Nabin Hait
9c1ae09994
Merge pull request #1689 from rmehta/develop
...
fix to pos invoice
2014-05-26 16:22:03 +05:30
Rushabh Mehta
d82e85d099
fix to pos invoice
2014-05-26 16:01:01 +05:30
Nabin Hait
c1d0851a56
Merge pull request #1687 from nabinhait/v4-hotfix
...
Update status based on communication. Fixes #1682
2014-05-26 15:07:31 +05:30
Nabin Hait
08dd6af446
Update status based on communication. Fixes #1682
2014-05-26 15:06:42 +05:30
Nabin Hait
ff8f32ca80
Merge pull request #1686 from rmehta/develop
...
Fixes
2014-05-26 13:36:28 +05:30
Rushabh Mehta
a7c46e4d83
removed debug in query (packing_slip.py)
2014-05-26 13:35:47 +05:30
Rushabh Mehta
b15d760406
fix to packing slip (validation)
2014-05-26 13:05:19 +05:30
Rushabh Mehta
9f399f139b
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-26 11:40:46 +05:30
Rushabh Mehta
3b0f026522
fix to sales parter
2014-05-24 12:04:13 +05:30
Anand Doshi
8db94e7407
Merge pull request #1680 from anandpdoshi/hotfix
...
Updated Translations
2014-05-23 10:43:16 +05:30
Anand Doshi
8d321446ad
Updated translations
2014-05-23 10:29:37 +05:30
Anand Doshi
c783c2636f
Updated translations
2014-05-23 09:22:12 +05:30
Anand Doshi
5468740042
Fixed setup wizard errors for chinese simplified
2014-05-23 09:21:55 +05:30
Anand Doshi
69e4b16817
Setup Wizard: clear cache on language change
2014-05-22 22:52:36 +05:30
Pratik Vyas
e35a1025c9
hotfix: communication email bug
2014-05-22 18:37:55 +05:30
Rushabh Mehta
0f5601dad4
Merge pull request #1677 from rmehta/develop
...
Added title_field and added ignore_permission while creating Event from Lead
2014-05-22 11:23:03 +05:30
Pratik Vyas
a5f35e2b3c
Merge pull request #1678 from anandpdoshi/hotfix
...
Fixed global_defaults_to_system_settings
2014-05-22 11:15:21 +05:30
Anand Doshi
c57d7dea8b
Fixed global_defaults_to_system_settings
2014-05-22 11:05:46 +05:30
Rushabh Mehta
a39cae9c2e
added title field to support ticket, lead and employee
2014-05-21 17:34:22 +05:30
Anand Doshi
53142f125b
Merge pull request #1675 from nabinhait/v4-hotfix
...
Create serial no based on series only if item is serialized
2014-05-21 16:08:14 +05:30
Nabin Hait
edf87a258f
Create serial no based on series only if item is serialized
2014-05-21 15:38:56 +05:30
Anand Doshi
18144da755
Merge pull request #1674 from anandpdoshi/hotfix
...
Hook: setup_wizard_success
2014-05-21 15:25:11 +05:30
Anand Doshi
d6007e7d9c
Hook: setup_wizard_success
2014-05-21 15:22:15 +05:30
Rushabh Mehta
92ce693e6f
added ignore_permission in Lead for creating Event
2014-05-21 14:59:56 +05:30
Anand Doshi
d2802cab6c
Merge pull request #1672 from nabinhait/v4-hotfix
...
Account root type and email digest for income / expense
2014-05-21 12:50:08 +05:30
Nabin Hait
177fb132b9
description added in setup wizard
2014-05-21 12:39:37 +05:30
Nabin Hait
d811303d7b
minor fix
2014-05-21 12:36:43 +05:30
Nabin Hait
27b12ef1b6
update account root type patch
2014-05-21 11:53:59 +05:30
Nabin Hait
4efc5d74d4
Setup Wizard: company abbr length validation on onchange trigger
2014-05-21 11:53:59 +05:30
Nabin Hait
b5c552faf3
minor fix
2014-05-21 11:53:59 +05:30
Nabin Hait
dec02340e8
reload account doc in root type patch
2014-05-21 11:53:59 +05:30
Nabin Hait
3f80ef0648
reload account doc in root type patch
2014-05-21 11:53:59 +05:30
Nabin Hait
44ae408b36
Income/expense info in email digest
2014-05-21 11:53:58 +05:30
Nabin Hait
0e6554edc1
Root Type field added in account and patch for existing accoutns
2014-05-21 11:53:58 +05:30
Pratik Vyas
c8c5d37bcf
Release 4.0.2
2014-05-20 16:42:10 +05:30
Pratik Vyas
5873e50c50
Release 4.0.2
2014-05-20 16:42:01 +05:30
Pratik Vyas
4f1371945d
hotfix: frappe version in requirements.txt
2014-05-20 16:39:29 +05:30
Pratik Vyas
444d496c8b
Release v4.0.1
2014-05-20 16:32:21 +05:30
Pratik Vyas
98c09e2a91
Release v4.0.1
2014-05-20 16:17:22 +05:30
Nabin Hait
f5ac91da06
Merge pull request #1671 from nabinhait/v4-hotfix
...
V4 hotfix
2014-05-20 15:25:20 +05:30
Nabin Hait
f7361fc982
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-20 15:08:13 +05:30
Nabin Hait
c49b7f8c63
minor fix
2014-05-20 15:07:18 +05:30
Anand Doshi
1a7c3897b1
Merge pull request #1667 from nabinhait/v4-hotfix
...
Server side onload functionality in multiple docs && support ticket status
2014-05-20 10:46:37 +05:30
Nabin Hait
956d7868b5
removed print statement
2014-05-20 10:36:14 +05:30
Nabin Hait
85786f3071
Support ticket / lead status based on communication. Fixes #1645
2014-05-19 19:31:40 +05:30
Nabin Hait
2e0620e370
Server side onload functionality in multiple docs
2014-05-19 18:15:58 +05:30
Pratik Vyas
f87c72646c
Merge pull request #1660 from anandpdoshi/hotfix
...
Fixed multilingual UOM issue
2014-05-17 00:12:14 +05:30
Anand Doshi
6664af9557
Fixed multilingual UOM issue
2014-05-17 00:07:45 +05:30
Nabin Hait
097227d5ea
Merge pull request #1659 from nabinhait/v4-hotfix
...
translation and fraction issue fixes
2014-05-16 20:11:26 +05:30
Nabin Hait
e60853930b
traslation issue fixed in setup wizard and desktop
2014-05-16 19:56:43 +05:30
Nabin Hait
091b48168e
Journal voucher debit != credit #fraction issue
2014-05-16 19:56:43 +05:30
Nabin Hait
ad68d64d93
Leave approver select options in leave application and employee
2014-05-16 19:56:43 +05:30
Pratik Vyas
fa7444ec94
fix shipping rule test cases (copy name with copy_doc)
2014-05-16 15:19:51 +05:30
Pratik Vyas
3d8f8f68d8
Merge pull request #1652 from anandpdoshi/hotfix
...
Do not create Feed when frappe.flags.in_patch
2014-05-16 12:38:24 +05:30
Nabin Hait
a220e5d850
Update global_defaults_to_system_settings.py
2014-05-15 18:36:38 +05:30
Nabin Hait
ac3ba70ed9
Update global_defaults_to_system_settings.py
2014-05-15 18:25:57 +05:30
Nabin Hait
52b5c134fc
Update global_defaults_to_system_settings.py
2014-05-15 18:25:10 +05:30
Nabin Hait
5c50e213ac
Update global_defaults_to_system_settings.py
2014-05-15 18:18:32 +05:30
Pratik Vyas
740dd447b4
Merge pull request #1654 from nabinhait/v4-hotfix
...
fixes and patches
2014-05-15 18:11:39 +05:30
Nabin Hait
9419575126
Merged language patch with global_defaults_to_system_settings patch
2014-05-15 17:17:58 +05:30
Nabin Hait
d0a915c47a
Global Defaults to system settings. Fixes #1653
2014-05-15 16:42:23 +05:30
Nabin Hait
b5a8cab8df
Valuation Rate column in Stock Ledger report. Fixed #1633
2014-05-15 11:50:46 +05:30
Nabin Hait
bc7659ab90
Employee leave balance report fixes #1647
2014-05-15 11:37:12 +05:30
Anand Doshi
38d5424b21
Do not create Feed when frappe.flags.in_patch
2014-05-14 19:33:21 +05:30
Anand Doshi
3c4dba3e51
Merge pull request #1650 from nabinhait/v4-hotfix
...
Clear default for price_list_currency
2014-05-14 19:15:49 +05:30
Nabin Hait
ea7e3d6405
Clear default for price_list_currency
2014-05-14 18:52:06 +05:30
Anand Doshi
f70c7320d5
Merge pull request #1649 from anandpdoshi/hotfix
...
Pass frm to open_mapped_doc
2014-05-14 18:00:30 +05:30
Anand Doshi
54b7962eb9
Pass frm to open_mapped_doc
2014-05-14 17:38:45 +05:30
Nabin Hait
7b1698dbae
Merge pull request #1646 from anandpdoshi/hotfix
...
Setup Wizard width, Stock Reconcilation
2014-05-14 16:57:30 +05:30
Anand Doshi
39cc1df560
Fixes #1635 , Stock Reconcilation
2014-05-14 15:10:00 +05:30
Anand Doshi
5ce287d611
Setup Wizard width fix for chrome
2014-05-14 13:31:11 +05:30
Anand Doshi
51ba6f816b
Fixed Setup Wizard
2014-05-13 21:02:47 +05:30
Nabin Hait
a8e7191b14
Merge pull request #1640 from anandpdoshi/print_format_lowercase
...
Changed Print Format files to lowercase
2014-05-13 18:21:22 +05:30
Anand Doshi
4c83e407a9
Changed Print Format files to lowercase
2014-05-13 17:58:30 +05:30
Pratik Vyas
b1f212d653
Merge pull request #1638 from anandpdoshi/hotfix
...
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
2014-05-13 17:38:30 +05:30
Anand Doshi
0e2cf69345
Merge pull request #1636 from nabinhait/v4-hotfix
...
reports, print formats modified and minor fix
2014-05-13 17:31:14 +05:30
Anand Doshi
8fe0208fb6
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
2014-05-13 16:52:26 +05:30
Nabin Hait
03f3a8a2ef
Get taxes and charges records from matser. Fixes #1634
2014-05-13 16:38:31 +05:30
Nabin Hait
aade34b0c9
Reports and print formats modified for renamed fields
2014-05-13 16:12:37 +05:30
Nabin Hait
10f97d2e9e
Merge pull request #1631 from nabinhait/v4-hotfix
...
daily time log summary report fixes
2014-05-13 11:41:12 +05:30
Nabin Hait
54f0d24d80
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-13 11:33:09 +05:30
Nabin Hait
b76061530e
Daily time log fixes #1614
2014-05-13 11:32:39 +05:30
Anand Doshi
d711209dde
Fixed patches.txt
2014-05-12 19:42:38 +05:30
Nabin Hait
3b5f107a11
Merge pull request #1630 from nabinhait/v4-hotfix
...
fixes
2014-05-12 17:50:03 +05:30
Nabin Hait
b3bead2f06
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-12 17:46:02 +05:30
Nabin Hait
827480fd2b
import, export and report permission in account and pricing rule
2014-05-12 17:45:37 +05:30
Nabin Hait
0c54e2d0d0
4_0 patch dir renamed to v4_0
2014-05-12 17:44:55 +05:30
Rushabh Mehta
2fdb51f85e
fixes frappe/erpnext#1627
2014-05-12 17:32:36 +05:30
Rushabh Mehta
37f54f9a35
added description to letter head in setup wizard
2014-05-12 16:45:49 +05:30
Pratik Vyas
b2ce9c5487
Merge pull request #1625 from anandpdoshi/hotfix
...
Added hook: setup_wizard_exception
2014-05-12 12:53:38 +05:30
Anand Doshi
02edae8fac
Added hook: setup_wizard_exception
2014-05-12 12:37:32 +05:30
Nabin Hait
fb7fb73ba3
Merge pull request #1621 from nabinhait/v4-hotfix
...
BOM validation message fixed
2014-05-11 18:30:41 +05:30
Nabin Hait
bbfe2517ea
BOM validation message fixed
2014-05-11 18:27:07 +05:30
Nabin Hait
0baf1479a3
Merge pull request #1618 from nabinhait/v4-hotfix
...
Test case fixes for serial no
2014-05-11 13:11:02 +05:30
Nabin Hait
2f50b85f99
Test case fixes for serial no
2014-05-11 13:03:53 +05:30
Nabin Hait
8ae4bcac58
Merge pull request #1617 from nabinhait/v4-hotfix
...
test case fixes
2014-05-11 12:13:16 +05:30
Nabin Hait
0ff6e3a6bb
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-11 12:11:50 +05:30
Nabin Hait
75e50ee082
Fixes for subcontracting
2014-05-11 12:11:15 +05:30
Nabin Hait
6d5c248402
Test case fixes for serial no
2014-05-11 12:10:57 +05:30
Nabin Hait
5365108ef9
Test case fixes for pos setting
2014-05-11 12:10:17 +05:30
Nabin Hait
7e373010d7
Test case fixes in time log batch
2014-05-11 12:08:39 +05:30
Rushabh Mehta
409c8e9732
removed confirmation date validations (wtf)
2014-05-11 10:01:16 +05:30
Rushabh Mehta
75e11a7270
Merge pull request #1616 from pdvyas/migrate-3to4
...
3 to 4 migration fixes
2014-05-10 22:19:07 +05:30
Pratik Vyas
6e686224eb
fix patches
2014-05-10 22:17:04 +05:30
Pratik Vyas
95f558e7bc
fix update user properties patch
2014-05-10 22:16:39 +05:30
Rushabh Mehta
2667a50334
clear cache before running setup wizard
2014-05-09 19:20:31 +05:30
Rushabh Mehta
9591b8ec93
Merge pull request #1613 from anandpdoshi/deprecate-link-selects
...
Deprecate Select fields with options as link:
2014-05-09 14:09:51 +05:30
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Nabin Hait
a5ac0149af
Merge pull request #1612 from pdvyas/migrate-3to4
...
3 to 4 migration
2014-05-09 12:07:11 +05:30
Pratik Vyas
34e36a233c
Patch changes for 3 to 4 migration
2014-05-09 12:01:25 +05:30
Nabin Hait
d64a952b5d
Stock reco: item and warehouse validation and translation fixes
2014-05-09 11:50:24 +05:30
Nabin Hait
7dada72085
Merge pull request #1610 from nabinhait/v4-hotfix
...
minor fix
2014-05-09 10:54:53 +05:30
Nabin Hait
966edff222
minor fix
2014-05-09 10:54:12 +05:30
Nabin Hait
b52c6e866f
Merge pull request #1609 from nabinhait/v4-hotfix
...
V4 hotfix
2014-05-08 19:10:55 +05:30
Nabin Hait
344f4436f1
Create / update raw materials supplied table for sub-contracting
2014-05-08 19:08:20 +05:30
Nabin Hait
5d070753fd
Item managed batch-wise, can not be reconciled through stock reconciliation
2014-05-08 19:08:06 +05:30
Nabin Hait
844dd36ff9
PP tool: get items from SO based on item filter
2014-05-08 19:07:34 +05:30
Nabin Hait
3c5bc544ea
Serial no and batch no field added in purchase receipt item supplied table
2014-05-08 19:07:02 +05:30
Nabin Hait
227db769a0
Item valuation rate on material transfer based on fifo
2014-05-08 19:06:01 +05:30
Anand Doshi
713e453126
Merge pull request #1607 from anandpdoshi/hotfix
...
Fixed clear cache for item page
2014-05-08 17:46:30 +05:30
Anand Doshi
0c85169539
Fixed clear cache for item page
2014-05-08 17:46:00 +05:30
Anand Doshi
3415cdb208
Merge pull request #1604 from anandpdoshi/bugfix-v4
...
Newsletter status display. Fixes #1593
2014-05-08 12:09:29 +05:30
Anand Doshi
08ef467fc6
Fixed moduleview language issue
2014-05-08 11:43:18 +05:30
Nabin Hait
5da2f21aed
Merge pull request #1603 from nabinhait/v4-hotfix
...
fixes
2014-05-07 19:22:02 +05:30
Nabin Hait
e37b8e6682
fixed conflict
2014-05-07 19:20:56 +05:30
Nabin Hait
23649c6852
fixe in query.py
2014-05-07 19:18:15 +05:30
Anand Doshi
7e1b75a705
Newsletter status display. Fixes #1593
2014-05-07 18:44:02 +05:30
Nabin Hait
17425a24c6
Merge pull request #1602 from anandpdoshi/better-default-permissions
...
Better default permissions, ignore_restrictions for defaults, removed fi...
2014-05-07 17:51:08 +05:30
Anand Doshi
f410bd9bf9
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
...
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Nabin Hait
706eb7f2c7
fixed conflict
2014-05-07 15:13:52 +05:30
Nabin Hait
90f2d8d9fc
minor fix
2014-05-07 14:55:09 +05:30
Anand Doshi
dc644c37e6
Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year
...
Naming series by fiscal year
2014-05-07 11:06:36 +05:30
Anand Doshi
4b438eee6d
Revert "Autocreate naming series options based on Fiscal Year"
...
This reverts commit 8a6febbaa5 .
2014-05-07 10:58:39 +05:30
Anand Doshi
8a6febbaa5
Autocreate naming series options based on Fiscal Year
2014-05-06 19:44:22 +05:30
Anand Doshi
8c2dbab878
Changed default naming series options
...
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Nabin Hait
cc6b20b614
Merge pull request #1596 from nabinhait/v4-hotfix
...
V4 fixes and updates
2014-05-06 19:17:13 +05:30
Nabin Hait
3fcec56f7b
Bulk rename tool fixes #1594
2014-05-06 19:13:46 +05:30
Nabin Hait
a521343063
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-06 18:53:02 +05:30
Nabin Hait
ce4a87ce83
Maintenance schedule: get no of visits and period validation. Fixes #1591
2014-05-06 18:52:36 +05:30
Anand Doshi
7fc9b63dc7
Merge pull request #1590 from anandpdoshi/remove-india-specific-fields
...
Remove India specific fields
2014-05-06 16:48:18 +05:30
Nabin Hait
50e962b279
Special characters allowed in company name. Fixes #1259
2014-05-06 16:46:32 +05:30
Anand Doshi
4b7a6b13ec
Additions to remove India specific fields
2014-05-06 16:41:31 +05:30
Nabin Hait
3190f99ebe
Option for selecting already reconciled entries in bank reconciliation #1310
2014-05-06 16:39:24 +05:30
Anand Doshi
37909b292f
Remove India specific fields
2014-05-06 16:15:56 +05:30
Nabin Hait
8b22fab2f7
Merge pull request #1589 from nabinhait/v4-hotfix
...
V4 hotfix
2014-05-06 14:20:19 +05:30
Nabin Hait
5c82014ba9
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-06 14:01:30 +05:30
Nabin Hait
c82e967e97
Cannada translation
2014-05-06 14:01:04 +05:30
Nabin Hait
b63384b3d4
Merge pull request #1588 from nabinhait/v4-hotfix
...
Allow Rename option added in multiple docs. Fixes #1521
2014-05-06 12:34:50 +05:30
Nabin Hait
02d37bbb5a
Allow Rename option added in multiple docs. Fixes #1521
2014-05-06 12:18:50 +05:30
Anand Doshi
728be8c4d4
Merge pull request #1587 from anandpdoshi/bugfix-v4
...
Enable frequently used currencies. Fixes #1561
2014-05-06 12:18:37 +05:30
Nabin Hait
07a31d2975
Merge pull request #1586 from nabinhait/v4-hotfix
...
V4 hotfix
2014-05-06 12:03:06 +05:30
Anand Doshi
de560aa094
Enable frequently used currencies. Fixes #1561
2014-05-06 12:02:23 +05:30
Nabin Hait
b1285f9fce
Time Log Batch creation from time log list
2014-05-06 11:58:00 +05:30
Nabin Hait
cea4cd4e5f
Pull stock entry difference account from company
2014-05-06 11:57:33 +05:30
Pratik Vyas
4d911db902
Release 4.0.0
2014-05-05 19:14:45 +05:30
Nabin Hait
b99a3517c3
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-05 18:42:07 +05:30
Nabin Hait
98c2a052e5
Fixes in pricing rule testcases #565
2014-05-05 18:41:41 +05:30
Nabin Hait
ac1bc212ea
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-05 18:27:31 +05:30
Anand Doshi
91b451b8ce
Updated validate v3 patch
2014-05-05 18:25:37 +05:30
Anand Doshi
648062d071
Fixes in test cases
2014-05-05 16:46:38 +05:30
Rushabh Mehta
45a3226645
minor
2014-05-05 15:16:11 +05:30
Nabin Hait
f2db87a766
Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565
2014-05-05 15:04:55 +05:30
Nabin Hait
53dab55703
Pricing Rule: if multiple rules, ask to resolve conflict #565
2014-05-05 14:49:40 +05:30
Nabin Hait
0c7e28ec9f
Pricing Rule improvements #565
2014-05-05 11:13:36 +05:30
Nabin Hait
ed8a845e83
POS Make Payment dialog box fix #1441
2014-05-05 11:01:32 +05:30
Nabin Hait
d5886f36af
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-05 10:28:20 +05:30
Nabin Hait
f57f0a661a
Stock Entry: pulling items from BOM fixed #1579
2014-05-05 10:27:53 +05:30
Anand Doshi
69e0cb5d6f
Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573
2014-05-04 19:37:45 +05:30
Anand Doshi
2af558598c
Fixed travis
2014-05-04 16:13:33 +05:30
Nabin Hait
6dad4e9e89
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-04 16:02:44 +05:30
Nabin Hait
a096b2004f
Financial analytics graph fix #1542
2014-05-04 16:02:26 +05:30
Anand Doshi
4ab5382d3f
Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564
2014-05-04 11:50:10 +05:30
Rushabh Mehta
24a3ec57e3
update to tests
2014-05-03 16:22:46 +05:30
Anand Doshi
75042fd502
Show Activity entries based on permissions. Completely fixes #1481
2014-05-02 19:44:28 +05:30
Anand Doshi
2b0e4266cf
Go to home page on clicking left arrow in note list
2014-05-02 19:43:11 +05:30
Anand Doshi
ef5407479a
Show Chart of Accounts in Accounts > Documents. Fixes #1559
2014-05-02 19:42:27 +05:30
Anand Doshi
56f29cbb27
Fixed contact page response. Fixes #1557
2014-05-02 18:17:39 +05:30
Nabin Hait
232954d4b9
Fixed updating cost on BOM after submission #1563
2014-05-02 17:51:24 +05:30
Nabin Hait
053a87edf6
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 17:37:38 +05:30
Nabin Hait
296d626e53
Back flush issue fixed in sub contracting #1567
2014-05-02 17:36:13 +05:30
Nabin Hait
bc83b9c1ac
minor fix
2014-05-02 17:03:18 +05:30
Anand Doshi
b71a18cd1e
Leave Allocation Tool and Employee. Fixes #1555
2014-05-02 16:23:51 +05:30
Nabin Hait
2cebf9b499
minor fix #1565
2014-05-02 16:12:07 +05:30
Nabin Hait
ef30932807
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 15:45:52 +05:30
Nabin Hait
6b03914731
asynchronus issue in get_party_details
2014-05-02 15:45:10 +05:30
Anand Doshi
f29bcaf436
Added new fixtures ( Fixes #1540 ). Removed Employee Grade from HR.
2014-05-02 13:55:07 +05:30
Rushabh Mehta
4ceb20e07f
hooks.txt -> hooks.py
2014-05-02 12:15:11 +05:30
Nabin Hait
1e6c32e95f
Address and contact creation from opportunity #1570
2014-05-02 11:42:24 +05:30
Nabin Hait
92c4fc4e19
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 10:27:17 +05:30
Nabin Hait
d341254786
Purchase receipt to purchase invoice item
2014-05-01 17:42:21 +05:30
Anand Doshi
51e6d2228d
Salary Slip - read permission for Employee. Fixes #1553
2014-05-01 16:28:13 +05:30
Nabin Hait
292a254bc1
payment to invoice matching tool disabled temporarily
2014-05-01 15:46:37 +05:30
Nabin Hait
5b98340d15
payment to invoice matching
2014-05-01 15:43:22 +05:30
Nabin Hait
e5bd955f4d
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-01 09:56:14 +05:30
Anand Doshi
d9f0f27cd4
Fixes in test cases
2014-04-30 22:16:25 +05:30
Nabin Hait
dcfad4f645
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-30 20:32:07 +05:30
Nabin Hait
613919325d
Fixes in link field queries
2014-04-30 20:30:33 +05:30
Rushabh Mehta
a15164750d
started client side testing using selenium and other related and unrelated fixes
2014-04-30 19:39:13 +05:30
Nabin Hait
b85a9108eb
Payment to invoice matching tool
2014-04-30 19:32:16 +05:30
Nabin Hait
498ecfc192
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-30 19:31:22 +05:30
Nabin Hait
576f025c84
Payment to invoice matching tool
2014-04-30 19:30:50 +05:30
Anand Doshi
a47bf2ab66
Removed check for duplicate in sales bom, set default income account in Company
2014-04-30 18:54:05 +05:30
Anand Doshi
f62da519d6
Sales BOM Parent Item search - Fixes #1544
2014-04-30 16:50:39 +05:30
Anand Doshi
04f8990c11
Fixed can freeze account check for account doc in client side
2014-04-30 15:02:17 +05:30
Rushabh Mehta
33003c6168
fix for feature setup in install.py
2014-04-30 11:16:02 +05:30
Rushabh Mehta
104c9f465d
updated translations
2014-04-29 18:36:27 +05:30
Rushabh Mehta
d21f55b5d2
fix in naming and feature setup on install:
2014-04-29 16:25:07 +05:30
Nabin Hait
b54307d58e
minor fixes for pos trigger
2014-04-29 13:40:54 +05:30
Nabin Hait
b1777ecfd8
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-29 11:31:37 +05:30
Nabin Hait
17910aa0d6
Removed income and expense related info temporarily from email digest
2014-04-29 11:31:11 +05:30
Anand Doshi
cd17bdffcd
Fixes in account query, fiscal year and cost center
2014-04-28 20:34:48 +05:30
Nabin Hait
6777efa7fa
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-28 17:09:13 +05:30
Nabin Hait
985918d42b
Minor fixes in company and account
2014-04-28 17:08:28 +05:30
Anand Doshi
69aa8ffac4
Fixed as_dict of employee.py
2014-04-28 16:51:34 +05:30
Nabin Hait
2594e41462
Removed Stock Ledger doctype
2014-04-28 16:23:45 +05:30
Nabin Hait
48962e1148
Minor fix in sales funnel report
2014-04-28 15:43:32 +05:30
Anand Doshi
65f83cbae7
BugFix: Sales Order with Order Type as Shopping Cart
2014-04-28 15:33:34 +05:30
Anand Doshi
3b3d55cda2
Usability: Set For Warehouse and Work-in-Progress Warehouse as mandatory, when the user clicks Submit
2014-04-28 15:33:34 +05:30
Anand Doshi
4c90bae16d
BugFix: Item search in Production Planning Tool
2014-04-28 15:33:34 +05:30
Anand Doshi
6916baa299
BugFix: Item search in Stock UOM Replace Utility
2014-04-28 15:33:34 +05:30
Nabin Hait
ac87c1d618
Merge pull request #1537 from n3storm/develop
...
Update mode_of_payment.py
2014-04-28 15:32:31 +05:30
Néstor Díaz Valencia
21412ddf65
Update mode_of_payment.py
...
Renamed solves issue #1536
2014-04-28 11:54:31 +02:00
Rushabh Mehta
41d126586e
fix get_server_fields in stock_entry.js
2014-04-27 12:30:20 +05:30
Anand Doshi
8e5b2af0fb
Set conversion_factor in stock entry test case
2014-04-25 19:35:06 +05:30
Anand Doshi
fc79efb97c
Fixes #1532 . Only show an error message for missing Quality Inspection but let the user submit Purchase Receipt.
2014-04-25 18:44:28 +05:30
Anand Doshi
1872312cc6
Deprecated client side mapper: frappe.model.map. Fixes #1530
2014-04-25 18:38:08 +05:30
Anand Doshi
e3f6b6d899
Fixed Opportunity Lost UX
2014-04-25 18:36:06 +05:30
Anand Doshi
69a2c25ca5
Fixed set_query
2014-04-25 18:35:45 +05:30
Anand Doshi
bbffaf78fb
BugFix: use transfer_qty instead of actual_qty in check_duplicate_entry_for_production_order - ported webnotes/erpnext@942ff2583b
2014-04-25 18:31:09 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +05:30
Anand Doshi
7f2d08b03f
Fixed Naming Series page loading fails #1524
2014-04-24 13:51:35 +05:30
Anand Doshi
8c62c40a3d
Fixed Make Sales Order from Quotation #1522
2014-04-24 12:40:19 +05:30
Anand Doshi
78eeacb53c
Fixes in Lead, Opportunity, Quotation, Setup Wizard
2014-04-23 19:15:15 +05:30
Anand Doshi
f50a65294f
Fixed NameError handling
2014-04-23 13:41:28 +05:30
Anand Doshi
b054eb7a4f
Call calculate_taxes_and_totals after mapping
2014-04-22 20:35:22 +05:30
Anand Doshi
4bb87373dc
Fixed default website creation
...
Default website generation was creating company page twice,
which led to duplicate website route validation
2014-04-22 19:50:08 +05:30
Anand Doshi
68d0b7c7ff
get_item_details fixed for Material Request
2014-04-22 19:30:53 +05:30
Anand Doshi
3e41fd1fd3
List route for tree browser based doctypes; Fixes to add child in tree browsers
2014-04-22 18:55:21 +05:30
Rushabh Mehta
4ef1835bee
website updates
2014-04-22 16:52:35 +05:30
Anand Doshi
2944f49974
Setup Wizard: on country select, change date format, save logo in Website Settings > Brand HTML
2014-04-22 16:25:58 +05:30
Anand Doshi
07339fc69e
Fixes in Setup Wizard and Attachments
2014-04-22 15:30:24 +05:30
Rushabh Mehta
3f51705ba4
website cleanups
2014-04-21 22:10:43 +05:30
Anand Doshi
0549b1c5c9
Duplicate supplier delivery number validation in Purchase Receipt should happen per financial year
2014-04-21 15:59:47 +05:30
Anand Doshi
21ae930b4c
Removed controller.py
2014-04-21 15:12:50 +05:30
Anand Doshi
424c033395
Removed controller.py
2014-04-21 15:06:56 +05:30
Rushabh Mehta
40b2b03bcb
demo fixes
2014-04-21 13:43:35 +05:30
Rushabh Mehta
f63513ed38
minor fixes to website
2014-04-21 13:43:35 +05:30
Anand Doshi
9365b616b8
Added an exist check for accounts.utils.get_balance_on
2014-04-21 12:42:21 +05:30
Anand Doshi
cbbf451974
Fixes throw
2014-04-21 11:33:49 +05:30
Rushabh Mehta
0900beecb2
added languages.txt
2014-04-18 16:24:28 +05:30
Anand Doshi
5d591ebe83
Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext
2014-04-18 16:20:07 +05:30
Rushabh Mehta
603e6e21b5
test fixes
2014-04-18 16:17:29 +05:30
Rushabh Mehta
370a024e46
cleaned up sample website and separated fixtures by country
2014-04-18 16:00:41 +05:30
Rushabh Mehta
169c1fd93b
fixed translation for setup-wizard and removed purchase validation for Material Request #925
2014-04-18 10:40:17 +05:30
Anand Doshi
ac32bad25a
Fixes in Taxes, Quotation and Address Territory
2014-04-18 01:32:02 +05:30
Pratik Vyas
33e1db8c40
Add language to setup wizard (travis)
2014-04-17 19:04:34 +05:30
Rushabh Mehta
52e618d0b2
updates to Setup Wizard, set language as first input
2014-04-17 18:50:33 +05:30
Anand Doshi
dbfcd328fb
Fixes update_after_submit validation errors
2014-04-17 12:35:04 +05:30
Anand Doshi
0d345c9152
Fixes Item Price duplicate entry validation
2014-04-17 11:40:22 +05:30
Anand Doshi
de1a97d506
Fixes get_voucher_detail for Stock Reconcilation
2014-04-17 11:37:46 +05:30
Anand Doshi
094610d7ce
Fixes in Production, Stock Entry and Stock Controller
2014-04-16 20:23:24 +05:30
Rushabh Mehta
eea802298e
refactor get_voucher_details in stock_controller
2014-04-16 19:38:40 +05:30
Rushabh Mehta
052fe82688
production order: test fixed and added in test_stock_entry.py
2014-04-16 19:20:11 +05:30
Rushabh Mehta
166bc2a0e0
translations: updated German
2014-04-16 18:37:57 +05:30
Rushabh Mehta
c38fc713c6
updated translations
2014-04-16 17:46:30 +05:30
Rushabh Mehta
8c51318d82
added naming series for campaign #1413
2014-04-16 17:41:52 +05:30
Rushabh Mehta
e8b0402a10
added naming series for campaign #1413
2014-04-16 17:41:52 +05:30
Rushabh Mehta
c635875765
added naming series for campaign #1413
2014-04-16 17:41:51 +05:30
Anand Doshi
652bc0784a
Ported v3 fixes to v4
...
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
2014-04-16 15:26:42 +05:30
Nabin Hait
13429a3b34
Space allowed in naming series
...
Conflicts:
setup/doctype/naming_series/naming_series.py
2014-04-16 15:24:04 +05:30
Nabin Hait
a0c239db8d
perpetual inventory fix related to sub-contracting
...
Cherry-picked and modified by @anandpdoshi
Conflicts:
accounts/doctype/purchase_invoice/purchase_invoice.py
controllers/buying_controller.py
controllers/stock_controller.py
2014-04-16 15:23:10 +05:30
Nabin Hait
450d9d72d7
Minor fix in monthly attendance report
...
Cherry-picked and modified by @anandpdoshi
Conflicts:
hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
2014-04-16 15:23:09 +05:30
Nabin Hait
6298536e46
set stock balance as per serial no count
...
Cherry Picked and Modified by @anandpdoshi
Conflicts:
stock/doctype/stock_ledger/stock_ledger.py
utilities/repost_stock.py
2014-04-16 15:23:08 +05:30
Anand Doshi
88a869f34d
No Copy for Paid and Write Off Amount in Sales Invoice
...
Ported webnotes/erpnext@f739bffedd
2014-04-16 15:23:08 +05:30
Rushabh Mehta
1d8f1a9a46
#1481
2014-04-16 09:32:51 +05:30
Rushabh Mehta
82d8a637ac
#1252
2014-04-16 09:20:00 +05:30
Rushabh Mehta
d85dc868ca
more message fixes for translation
2014-04-15 22:54:34 +05:30
Rushabh Mehta
ff93802d58
more message fixes
2014-04-15 18:40:31 +05:30
Anand Doshi
a6e2ca9d3b
Fixes #1491
2014-04-15 17:12:15 +05:30
Rushabh Mehta
8a40c136ce
more message fixing
2014-04-15 16:31:20 +05:30
Anand Doshi
c5e057f676
Fixed exploded BOM construction
2014-04-15 16:14:15 +05:30
Rushabh Mehta
2c45899a02
fixed strings for translation
2014-04-15 14:41:56 +05:30
Anand Doshi
5d4ffa6cf8
Fixed splash.svg
2014-04-15 13:09:09 +05:30
Pratik Vyas
f37d6fe32b
Merge pull request #1514 from frappe/js-translate-refactor
...
JS translation refactor
2014-04-15 11:44:16 +05:30
Pratik Vyas
e1eeb22f1e
remove linebreaks for translation strings (js)
2014-04-15 10:50:36 +05:30
Pratik Vyas
13c92e3ad5
fix accounts browser and cost center strings (js)
2014-04-15 10:08:53 +05:30
Pratik Vyas
ec9c448ccf
fix taxes and charges strings and labels
2014-04-15 09:49:40 +05:30
Rushabh Mehta
549977bf4f
typo fix in journal_voucher.py
2014-04-14 22:40:17 +05:30
Rushabh Mehta
354b32177d
fix for leave application test
2014-04-14 22:23:41 +05:30
Rushabh Mehta
9f0d625300
update translation strings #1403
2014-04-14 19:20:45 +05:30
Pratik Vyas
b0f279a34e
js translations refactor
2014-04-14 17:14:23 +05:30
Pratik Vyas
b52618c142
frappe._ to __
2014-04-14 16:25:30 +05:30
Pratik Vyas
7da01d6007
fix manifest
2014-04-13 03:12:12 +05:30
Anand Doshi
bd67e87921
Fixes saving of Sales Order and fetching Prices frappe/frappe#478
2014-04-11 16:51:27 +05:30
Anand Doshi
13ae548ff6
Fixes for model-cleanup frappe/frappe#478
2014-04-10 18:43:07 +05:30
Pratik Vyas
f7daab7393
pass only valid columns to get_item_details
2014-04-10 17:53:30 +05:30
Anand Doshi
233fbb08b2
Minor fix
2014-04-10 12:53:16 +05:30
Anand Doshi
61649c1d43
Verbose in travis
2014-04-10 12:40:29 +05:30
Anand Doshi
ddd2b8a398
Merge pull request #1504 from frappe/model-cleanup
...
Model cleanup
2014-04-10 11:39:16 +05:30
Anand Doshi
8c45d4ce3c
Fixed travis frappe/frappe#478
2014-04-10 11:38:11 +05:30
Anand Doshi
20771621e7
Verbose app install in travis
2014-04-09 20:03:27 +05:30
Anand Doshi
9fd50bcfb6
Fixed rest of the test cases frappe/frapp#478
2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d
Fixed Test Cases frappe/frappe#478
2014-04-08 20:15:22 +05:30
Anand Doshi
cd71e1d8ab
Test Cases - Journal Voucher, Purchase Invoice, Period Closing Voucher frappe/frappe#478
2014-04-08 13:53:35 +05:30
Anand Doshi
2ce39cf770
Fixed Stock Entry Test Cases frappe/frappe#478
2014-04-07 18:51:58 +05:30
Nabin Hait
103cc58cb6
material request testcase #478
2014-04-07 16:40:43 +05:30
Nabin Hait
4155e58a61
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-07 16:00:49 +05:30
Nabin Hait
088dec6c09
testcase fixes #478
2014-04-07 16:00:28 +05:30
Rushabh Mehta
322d39f3a6
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-07 15:09:25 +05:30
Rushabh Mehta
49f49ea603
started party frappe/erpnext#1503
2014-04-07 15:09:09 +05:30
Nabin Hait
dc82d4f0cd
frappe/frappe#478 fixes
2014-04-07 12:02:57 +05:30
Nabin Hait
9f66c306ea
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-07 12:01:59 +05:30
Anand Doshi
bedc62f090
Fixed Feed
2014-04-04 16:26:45 +05:30
Nabin Hait
e7885e3ee0
frappe/frappe#478 replaced doclist in testcases
2014-04-04 13:26:50 +05:30
Rushabh Mehta
a504f0638b
frappe/frappe#478 , fixed list passed in
2014-04-04 12:16:26 +05:30
Rushabh Mehta
558a9aabfb
removed control panel
2014-04-04 12:00:36 +05:30
Nabin Hait
312ba99e71
frappe/frappe#478 fixes
2014-04-04 11:06:10 +05:30
Rushabh Mehta
c10213d861
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-03 17:43:28 +05:30
Rushabh Mehta
0cf531c8a6
frappe/frappe#478 fixes
2014-04-03 17:43:06 +05:30
Nabin Hait
c272f2020b
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-03 17:39:50 +05:30
Nabin Hait
365ae27acf
frappe/frappe#478 fixes
2014-04-03 17:38:54 +05:30
Rushabh Mehta
7db7112d3f
frappe/frappe#478 fix and added print heading
2014-04-03 15:04:18 +05:30
Rushabh Mehta
99f914b782
frappe/frappe#478 , fixes
2014-04-03 14:47:03 +05:30
Rushabh Mehta
2fbb00fd8d
frappe/frappe#478 , more changes, removed bean
2014-04-03 14:38:22 +05:30
Rushabh Mehta
f14b809ab5
frappe/frappe#478 , more changes, removed bean
2014-04-03 14:30:42 +05:30
Rushabh Mehta
d36cb5c812
frappe/frappe#478 removed more instances of doclist
2014-04-03 12:38:42 +05:30
Rushabh Mehta
cfb6ccfe51
frappe/frappe#478 removed self.doclist
2014-04-03 11:46:52 +05:30
Rushabh Mehta
f191f854cd
frappe/frappe#478 erpnext install works
2014-04-02 18:09:34 +05:30
Anand Doshi
943e614810
frappe/frappe#478
2014-04-02 16:37:35 +05:30
Anand Doshi
63dfe3d3b3
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-02 15:03:51 +05:30
Anand Doshi
5b552b51f1
frappe/frappe#478
2014-04-02 15:03:35 +05:30
Rushabh Mehta
732825cb23
frappe/frappe#478 fixed todo and renamed hooks
2014-04-02 12:08:03 +05:30
Anand Doshi
dd32d6eb1f
frappe/frappe#478
2014-04-01 12:22:14 +05:30
Rushabh Mehta
f2227d033c
frappe/frappe#478 , removed instances of .fields
2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58
frappe/frappe#478 added test_records.json
2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2
frappe/frappe#478 , frappe tests pass, .txt renamed to .json
2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9
frappe/frappe#478
2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc
frappe/frappe#478
2014-03-28 16:57:21 +05:30
Rushabh Mehta
b385ecf65e
frappe/frappe#478
2014-03-28 16:54:45 +05:30
Anand Doshi
43405203b2
frappe/frappe#478
2014-03-28 16:43:50 +05:30
Anand Doshi
81ba0b29da
frappe/frappe#478
2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28
Replaced doc, doc.fields frappe/frappe#478
2014-03-28 13:55:00 +05:30
Anand Doshi
67d6a4e3aa
Merge remote-tracking branch 'frappe/develop' into model-cleanup
...
Conflicts:
erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/controllers/stock_controller.py
2014-03-28 13:41:59 +05:30
Anand Doshi
40534f076b
Changed creation, modified format frappe/frappe#478
2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608
frappe/frappe#478
2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a
frappe/frappe#478
2014-03-27 17:51:41 +05:30
Nabin Hait
4090c78c3f
coa: payment to invoice matching tool fixes
2014-03-27 17:19:32 +05:30
Nabin Hait
becf75d791
Perpetual inventory cleanup
2014-03-27 17:18:29 +05:30
Rushabh Mehta
d2b34dc30c
frappe/frappe#478
2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0
#478
2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf
refactored client side Model and Meta - frappe/frappe#478
2014-03-26 18:24:30 +05:30
Nabin Hait
5c6b34a84c
minor fix
2014-03-26 10:30:25 +05:30
Nabin Hait
3a70ba3ba1
Merge github.com:frappe/erpnext into develop
2014-03-26 10:23:53 +05:30
Nabin Hait
d6e4ab3fd4
maintenance schedule: validate amc dates and update in serial no
2014-03-26 10:23:27 +05:30
Nabin Hait
1d630ccaa5
Update serial no maintenance status based on warranty/amc expiry date
2014-03-26 10:23:14 +05:30
Anand Doshi
754cbd4036
Fixed Permissions and Time Log
2014-03-25 20:09:12 +05:30
Nabin Hait
6fa0f25e7c
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-25 19:36:16 +05:30
Nabin Hait
0c9d42258c
Minor fix related to pos paid amount
2014-03-25 19:35:41 +05:30
Anand Doshi
79196a9ef7
Fixed install
2014-03-25 19:32:08 +05:30
Anand Doshi
059b83a2ce
Fixed MariaDB install steps in travis
2014-03-25 18:40:46 +05:30
Anand Doshi
3be9e26934
Fixed MariaDB install steps in travis
2014-03-25 18:39:56 +05:30
Nabin Hait
2c517e0a62
Fixes related to countrywise coa
2014-03-25 18:28:49 +05:30
Nabin Hait
ec9fb67d84
fixed conflict
2014-03-25 16:53:50 +05:30
Anand Doshi
7fbdba02ab
Fixed Countrywise Chart of Accounts patch
2014-03-25 13:50:52 +05:30
Nabin Hait
221a8fff1c
minor fix in patch
2014-03-23 17:35:24 +05:30
Nabin Hait
96c0afe0f1
minor fix in patch
2014-03-23 17:25:02 +05:30
Nabin Hait
06a595090d
coa: minor fix
2014-03-21 18:30:46 +05:30
Nabin Hait
425bfc5c8d
minor fix in serial no
2014-03-21 18:15:26 +05:30
Nabin Hait
c07537b1e9
unidecode added to the erpnext requirements
2014-03-21 12:25:49 +05:30
Nabin Hait
155c96b410
patch to delete mis control and financial statements and set bank/cash account
2014-03-21 12:15:13 +05:30
Nabin Hait
19dadb4a82
unidecode added to the erpnext requirements
2014-03-21 11:46:51 +05:30
Nabin Hait
f7f95ea37a
Merge pull request #1482 from nabinhait/countrywise_coa
...
Countrywise coa
2014-03-21 11:38:35 +05:30
Nabin Hait
0c21e2afef
Is_pl_account and debit_or_credit field removed and added report_type field in account
2014-03-21 11:35:59 +05:30
Nabin Hait
b5e6d7e171
Account balance in debit and credit columns in trial balance and financial analytics report
2014-03-21 11:26:09 +05:30
Nabin Hait
47a3c10334
Patch to update old accounts property
2014-03-21 11:26:08 +05:30
Nabin Hait
e67202484d
Imported charts with proper report types
2014-03-21 11:26:08 +05:30
Nabin Hait
e0f98d7202
account properties file added
2014-03-21 11:26:08 +05:30
Nabin Hait
102842ba79
Leave allocation fix
2014-03-21 11:26:08 +05:30
Nabin Hait
73083dc960
Fix related to user_default
2014-03-21 11:26:08 +05:30
Nabin Hait
27bb7892b3
Fixes in pos settings
2014-03-21 11:26:07 +05:30
Nabin Hait
482ffac83f
Set paid amount to zero if not pos
2014-03-21 11:26:07 +05:30
Nabin Hait
439dceebd8
minor fix in landed cost wizard
2014-03-21 11:25:17 +05:30
Nabin Hait
e848914da1
consider all entries against bank account in bank reconciliation statement, even if no reference no
2014-03-21 11:25:17 +05:30
Nabin Hait
d8dcdfbf4f
Warehouse disable option
2014-03-21 11:25:17 +05:30
Nabin Hait
eb1192771f
set root type from parent or child
2014-03-21 11:25:17 +05:30
Nabin Hait
e71cf6d6a1
More country charts imported from openerp
2014-03-21 11:25:17 +05:30
Nabin Hait
037bf6b382
More country charts imported from openerp
2014-03-21 11:25:17 +05:30
Nabin Hait
24e136e3f3
Patch: set root_type for old existing accounts
2014-03-21 11:25:16 +05:30
Nabin Hait
3dfe854108
Rename duplicate account
2014-03-21 11:25:16 +05:30
Nabin Hait
fc37fd8b6e
Set Paid amount and write off amount for pos
2014-03-21 11:25:16 +05:30
Nabin Hait
55a03dbf69
major fixes in importing charts from openerp
2014-03-21 11:22:42 +05:30
Nabin Hait
b93ebaebe4
Added new account types and patch for existing
2014-03-21 11:22:41 +05:30
Nabin Hait
a18bf07920
updated charts json with proper account and root types
2014-03-21 11:22:41 +05:30
Nabin Hait
d7d9d25d71
Country and chart fields added in company master
2014-03-21 11:22:40 +05:30
Nabin Hait
813a93d78d
import chart records into database frm json
2014-03-21 11:22:40 +05:30
Nabin Hait
a69c30edec
country code added
2014-03-21 11:22:39 +05:30
Nabin Hait
d89f3403ac
charts of account doctype added and imported charts json from openerp
2014-03-21 11:22:39 +05:30
Nabin Hait
b77773ca07
fixes in financial statements
2014-03-21 11:22:38 +05:30
Nabin Hait
2b57ecbd6c
fixes for debit_or_credit in account tree grid report
2014-03-21 11:22:38 +05:30
Nabin Hait
53822ae9d0
Account balance must be of type debit/credit
2014-03-21 11:22:38 +05:30
Nabin Hait
49a6f0754e
Removed debit_or_credit field
2014-03-21 11:22:38 +05:30
Nabin Hait
133490a0c5
Removed max roots validation
2014-03-21 11:22:37 +05:30
Nabin Hait
4d713ac5ba
sql injection fixes
2014-03-21 11:22:37 +05:30
Anand Doshi
eb7fea673b
Fixed set_single_defaults during install
2014-03-19 17:10:01 +05:30
Anand Doshi
4b2692182a
Fixes after change in fields handling in Document
2014-03-19 16:58:42 +05:30
Anand Doshi
76f330ca66
Fixed Fiscal Year input issue in Setup Wizard
2014-03-19 15:45:05 +05:30
Anand Doshi
2134d24b36
Removed cloud subscription logic
2014-03-14 15:24:57 +05:30
Pratik Vyas
9d1e8640ef
Update README.md
2014-03-13 20:45:27 +05:30
Anand Doshi
49e0a687b3
Minor Fixes
2014-03-13 20:44:28 +05:30
Nabin Hait
54106807e4
Set paid amount to zero if not pos
2014-03-13 17:26:41 +05:30
Nabin Hait
a8dbb0dd41
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-13 17:23:24 +05:30
Pratik Vyas
65e8676f8b
Profile -> User
2014-03-13 03:09:15 +05:30
Pratik Vyas
5c81f9c44e
check docstatus before updating employee
2014-03-13 02:35:23 +05:30
Rushabh Mehta
7c932003ed
rename Profile to User frappe/frappe#470
2014-03-11 16:15:59 +05:30
Anand Doshi
c379c78fec
Fixed Dropbox, Scheduler, 3to4 migration
2014-03-11 15:17:13 +05:30
Anand Doshi
09a9f4c0c9
Added module to Report doctype
2014-03-07 17:20:22 +05:30
Anand Doshi
ec621194fc
Verbose is default in cli.py
2014-03-07 14:01:56 +05:30
Rushabh Mehta
c12ccdb6ea
bugfix erpnext/frappe#1446
2014-03-06 15:45:45 +05:30
Rushabh Mehta
d8de921c40
fixed erpnext/frappe#1441 and other pos related cleanups
2014-03-06 15:40:22 +05:30
Rushabh Mehta
73f0bf36c1
fixed #1454
2014-03-06 14:45:02 +05:30
Rushabh Mehta
2e7ad8980c
fix for queries
2014-03-06 12:28:47 +05:30
Rushabh Mehta
4541875c81
removed searchfield condition from get_match_cond frappe/erpnext#1457
2014-03-06 11:19:46 +05:30
Rushabh Mehta
0fabc6a841
minor fix
2014-03-06 11:19:46 +05:30
Rushabh Mehta
2a45e1cfd0
Merge pull request #1437 from ddimmich/patch-1
...
Update README.md
2014-03-06 10:46:03 +05:30
Anand Doshi
2d5727b17b
Ignore mandatory during email pulling
2014-03-05 19:24:07 +05:30
Anand Doshi
b2c2fca8a5
Added Pricing Rule to Accounts, Buying, Selling home
2014-03-05 18:25:10 +05:30
Nabin Hait
9472247b6e
Update stock_entry.js
2014-03-05 17:45:58 +05:30
Anand Doshi
ebdac5db5c
Fix in Pricing Rule Patch
2014-03-05 17:31:37 +05:30
Anand Doshi
7ea8528d50
Fixed Pricing Rule Cleanup Fieldname
2014-03-05 17:27:00 +05:30
Anand Doshi
74d0e40bdc
Moved Notification Count hooks to frappe, employee user id patch, Item ignore restriction fields
2014-03-05 15:24:29 +05:30
Nabin Hait
2d57b0aa52
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-05 10:51:04 +05:30
Anand Doshi
0c4ef64b32
Fixed booboo: Moved website moduleview to framework
2014-03-04 11:15:08 +05:30
Anand Doshi
e30511d315
Email Settings split into Outgoing Email Settings and Support Email Settings
2014-03-03 20:32:20 +05:30
Anand Doshi
64f2ccd9e1
Global Settings in Setup, Sales Master Manager can restrict for Customer
2014-03-03 19:28:30 +05:30
Anand Doshi
6b12b07b33
Fixes to Module Views
2014-03-03 16:05:00 +05:30
Anand Doshi
f5794f1c07
Module Home Pages using Module View
2014-03-03 15:06:34 +05:30
Nabin Hait
8e4640f464
minor fix in report
2014-03-03 12:06:50 +05:30
Nabin Hait
f976143063
pricing rule patch fix
2014-02-28 19:02:27 +05:30
Nabin Hait
177b86a15b
fix in pricing rule
2014-02-28 15:47:22 +05:30
Nabin Hait
e7e615cf18
pricing rule: fixes in testcase
2014-02-28 15:21:49 +05:30
Nabin Hait
13b93ebed8
pricing rule: fixes in testcase
2014-02-28 15:04:05 +05:30
Nabin Hait
3319170805
pricing rule: condition for tree-type docs
2014-02-28 13:04:19 +05:30
Nabin Hait
ed5f423e65
pricing rule: condition for tree-type docs
2014-02-28 13:04:19 +05:30
Nabin Hait
311079a311
Patch: copy customer discount to pricing rule
2014-02-28 13:04:19 +05:30
Nabin Hait
08222150f2
Pricing Rule fixes and reference field in all item table
2014-02-28 13:02:00 +05:30
Nabin Hait
7e8e8ba714
pricing rule
2014-02-28 13:02:00 +05:30
Nabin Hait
c65a0c7197
Allowed stock entry import
2014-02-28 13:02:00 +05:30
Nabin Hait
bc34f3edae
shortage qty column added in stock projected qty report
2014-02-28 13:02:00 +05:30
Nabin Hait
615d342056
Pricing Rule: first commit
2014-02-28 13:02:00 +05:30
Anand Doshi
8462a7691b
Fixed login
2014-02-28 11:53:59 +05:30
Rushabh Mehta
063141d152
added patch for address
2014-02-28 11:37:36 +05:30
Anand Doshi
fb21ce3893
3to4 fixes
2014-02-27 13:18:20 +05:30
Damian Dimmich
1ee5675750
Update README.md
...
remove old doc line
2014-02-26 10:29:42 +01:00
Anand Doshi
e9baaa68e7
Changed frappe.conn to frappe.db
2014-02-26 12:35:33 +05:30
Anand Doshi
901f4434fd
Fixed Purchase Invoice test cases
2014-02-25 17:25:28 +05:30
Anand Doshi
0936ae6dca
Fixed company web page creation
2014-02-25 16:21:50 +05:30
Anand Doshi
4362443b6e
Propagate ignore_permissions during mapping from quotation to sales order
2014-02-25 15:42:32 +05:30
Anand Doshi
201dbbd977
Quotation Item Table can be empty
2014-02-25 15:42:32 +05:30
Rushabh Mehta
a6628eee56
rename sitemap to route
2014-02-25 11:08:37 +05:30
Nabin Hait
a1c96de9fc
party related cleanup
2014-02-21 14:45:10 +05:30
Rushabh Mehta
6fbda08583
fixed sitemap patch
2014-02-20 19:03:03 +05:30
Nabin Hait
cda83bba59
Row no fix in stock reconciliation
2014-02-20 15:01:51 +05:30
Nabin Hait
2f8d4451f5
calculate outstanding amount in server side, only if docstatus is 0
2014-02-20 14:59:37 +05:30
Nabin Hait
0f2310690e
fix in fetch item details and supplier non-mandatory to fetch
2014-02-20 11:27:47 +05:30
Pratik Vyas
33f36c3462
Add CI badge to readme
2014-02-20 00:17:43 +05:30
Pratik Vyas
a08855a0de
add site arg to travis build script, booboo
2014-02-20 00:06:35 +05:30
Pratik Vyas
3197767650
run setup wizard before running tests on travis
2014-02-19 23:22:02 +05:30
Pratik Vyas
28da7523be
set single defaults after install
2014-02-19 20:53:45 +05:30
Nabin Hait
ce64afaa51
default value in single doctypes
2014-02-19 19:12:01 +05:30
Nabin Hait
f5bb9ae1b1
default value in single doctypes
2014-02-19 19:02:40 +05:30
Nabin Hait
22831563ff
default value in selling settings
2014-02-19 18:35:54 +05:30
Nabin Hait
32f168617c
default value in global defaults
2014-02-19 18:11:42 +05:30
Nabin Hait
74bbd24b1d
Merge github.com:frappe/erpnext into develop
2014-02-19 17:43:51 +05:30
Nabin Hait
9d1f077922
get lead details in quotation
2014-02-19 17:43:24 +05:30
Rushabh Mehta
e0e3f92019
fixed sales / accounts tree
2014-02-19 12:43:16 +05:30
Nabin Hait
05b28eb161
minor fixes
2014-02-19 11:04:32 +05:30
Nabin Hait
36a4db69b8
price list on_trash function
2014-02-18 15:14:46 +05:30
Pratik Vyas
da0a23e635
remove print in patch, booboo
2014-02-17 14:56:00 +05:30
Pratik Vyas
31affc0e67
bump modified dates for purchase receipt and purchase invoice
2014-02-17 11:36:10 +05:30
Pratik Vyas
d4f9af3498
Delete install_erpnext.py
2014-02-15 15:29:29 +05:30
Pratik Vyas
ad9b4faa47
Update README.md
2014-02-15 15:23:25 +05:30
Pratik Vyas
0240dc53ae
4.change version to 4.0.0-beta
2014-02-14 16:10:55 +05:30
Pratik Vyas
ed20b68a3a
Update .travis.yml
2014-02-14 16:10:03 +05:30
Rushabh Mehta
86903e5f5b
fixed travis
2014-02-14 15:54:43 +05:30
Rushabh Mehta
793ba6bd37
-webnotes +frappe 💥
2014-02-14 15:47:51 +05:30
Nabin Hait
8ae051cb39
fixed conflict
2014-02-14 13:42:41 +05:30
Nabin Hait
adeff27f28
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-02-14 13:41:00 +05:30
Nabin Hait
9ea461638e
minor fix
2014-02-14 13:40:41 +05:30
Rushabh Mehta
989b60ae52
removed setup from desktop:
2014-02-14 13:16:39 +05:30
Pratik Vyas
fc274e29ec
Merge branch 'develop'
2014-02-14 10:36:23 +05:30
Pratik Vyas
d45f7d60c3
bumped to version 3.8.6
2014-02-14 11:06:23 +06:00
Nabin Hait
c1611abebf
Merge pull request #1418 from nabinhait/hotfix
...
minor fixes in account receivable/payable
2014-02-13 18:44:15 +05:30
Nabin Hait
e0f6b3edbe
minor fixes in account receivable/payable
2014-02-13 18:43:18 +05:30
Nabin Hait
a038831c45
validate item of item_price record
2014-02-13 15:54:51 +05:30
Nabin Hait
36028bfb56
minor
2014-02-12 19:09:28 +05:30
Nabin Hait
a87121c6da
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-02-12 17:09:08 +05:30
Nabin Hait
e219d61ed4
patch included in patches txt
2014-02-12 17:08:35 +05:30
Nabin Hait
66b2717c54
Merge pull request #1414 from akhileshdarjee/4.0-hotfix
...
Customer and Supplier dashboard set to company currency
2014-02-12 16:55:17 +05:30
Nabin Hait
eba1bdbcca
minor fixes
2014-02-12 16:04:17 +05:30
Nabin Hait
139dc7b9b2
minor fixes
2014-02-12 14:54:16 +05:30
Nabin Hait
0aa71a5c41
minor fixes
2014-02-12 14:54:15 +05:30
Nabin Hait
5aecc538dd
Letter Head field added in purchase receipt and invoice
2014-02-12 14:54:15 +05:30
Nabin Hait
5f59726903
Rename fields: replaced in html and txt files
2014-02-12 14:54:15 +05:30
Nabin Hait
1eb560130a
Rename fields: amount related fields
2014-02-12 14:54:14 +05:30
Nabin Hait
7979f7ed21
Field Rename: rate field mass replacement
2014-02-12 14:54:14 +05:30
Nabin Hait
a7f757a3f4
Rename fields: initial commit
2014-02-12 14:54:13 +05:30
Nabin Hait
777397489e
Fields renamed in schema
2014-02-12 14:54:13 +05:30
Nabin Hait
436f526102
commonify get_item_details and rename fields to sync selling and purchase
2014-02-12 14:54:12 +05:30
Nabin Hait
c28c86dfd8
Validate duplicate serial nos entry
2014-02-12 14:54:11 +05:30
Nabin Hait
9beffb646d
Validate duplicate serial nos entry
2014-02-12 14:54:11 +05:30
Nabin Hait
f0d29be1d5
Removed on_trash function from support ticket
2014-02-12 14:54:11 +05:30
Akhilesh Darjee
f2b7cd65a9
customer and supplier dashboard set to company currency
2014-02-12 11:29:08 +05:30
Anand Doshi
2735733d1f
Minor fix in setup import
2014-02-11 20:28:11 +05:30
Anand Doshi
93fdc670fe
Fixes in Test Cases
2014-02-11 14:40:21 +05:30
Nabin Hait
40c5174aa0
Merge pull request #1410 from nabinhait/hotfix
...
Hotfix
2014-02-11 12:03:11 +05:30
Nabin Hait
0799b28e46
Letter Head field added in purchase receipt and invoice
2014-02-11 12:02:46 +05:30
Pratik Vyas
89a3ee7f57
Merge branch 'develop'
2014-02-10 20:57:25 +05:30
Pratik Vyas
347bf93b4f
bumped to version 3.8.5
2014-02-10 21:27:25 +06:00
Anand Doshi
d7cc47e3ac
Do not validate Material Request against Sales Order, Moved Setup page to Framework
2014-02-10 17:39:12 +05:30
Anand Doshi
1d7e933590
Fix in Get Job Applications
2014-02-07 20:26:56 +05:30
Anand Doshi
080b64a98f
Fixes in Sales Partner and Support Mails
2014-02-07 19:14:21 +05:30
Rushabh Mehta
c4ec534b06
added config.setup
2014-02-07 19:04:19 +05:30
Rushabh Mehta
22ababbec1
configs
2014-02-07 18:16:11 +05:30
Pratik Vyas
17cb5b7799
Merge branch 'develop'
2014-02-07 16:03:09 +05:30
Pratik Vyas
e0c9dd3d23
bumped to version 3.8.4
2014-02-07 16:33:09 +06:00
Nabin Hait
41891ec95c
Merge pull request #1405 from nabinhait/hotfix
...
Serial No duplicate entry fix
2014-02-07 15:54:57 +05:30
Nabin Hait
dfc0072929
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-02-07 15:45:39 +05:30
Nabin Hait
e1e5d675ac
Validate duplicate serial nos entry
2014-02-07 15:33:34 +05:30
Nabin Hait
c4e92c6416
Validate duplicate serial nos entry
2014-02-07 15:22:50 +05:30
Anand Doshi
7c34f1c472
Test Item Group
2014-02-07 14:52:14 +05:30
Nabin Hait
2c832addca
Merge pull request #1404 from nabinhait/hotfix
...
Hotfix
2014-02-07 11:51:54 +05:30
Nabin Hait
c095cfa224
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-02-07 11:49:45 +05:30
Nabin Hait
fbb10d37d3
Removed on_trash function from support ticket
2014-02-07 11:49:26 +05:30
Anand Doshi
7bb9c3f125
Nested Set Test using Test Item group
2014-02-06 17:51:18 +05:30
Nabin Hait
a03f654446
Merge pull request #1382 from akhileshdarjee/4.0-hotfix
...
Newsletter can also be sent to employees
2014-02-06 16:02:39 +05:30
Nabin Hait
574c7e7c63
item related cleanup
2014-02-06 15:51:01 +05:30
Pratik Vyas
9294fc8e7e
Merge branch 'develop'
2014-02-06 15:27:11 +05:30
Pratik Vyas
07d4c373f3
bumped to version 3.8.3
2014-02-06 15:57:11 +06:00
Pratik Vyas
79499e3615
fix syntax error in material request, merge booboo
2014-02-06 15:25:17 +05:30
Pratik Vyas
cc9bc95b25
fix language typo in build script
2014-02-06 14:59:05 +05:30
Pratik Vyas
ae763d7afa
Merge pull request #1394 from pdvyas/testing-develop3
...
fix travis build script typo
2014-02-06 14:54:13 +05:30
Pratik Vyas
70e2a50f0f
fix travis build script typo
2014-02-06 14:07:58 +05:30
Pratik Vyas
c22ff12951
Merge pull request #1390 from pdvyas/testing4
...
fix webnotes url in travis build script
2014-02-06 13:37:41 +05:30
Pratik Vyas
1b8c158fdc
Merge pull request #1393 from pdvyas/testing-develop2
...
add travis build script
2014-02-06 13:37:21 +05:30
Pratik Vyas
4078ef8ef5
add travis build script
2014-02-06 13:36:26 +05:30
Akhilesh Darjee
462740f72b
sales funnel fix
2014-02-06 13:14:15 +05:30
Pratik Vyas
c055ea6465
fix webnotes url in travis build script
2014-02-06 12:54:52 +05:30
Anand Doshi
3decf4dbc5
Fixes related website hierarchy
2014-02-06 12:50:35 +05:30
Rushabh Mehta
4b41e420c0
cleaned up splash:
2014-02-06 11:02:53 +05:30
Rushabh Mehta
2c545ef1ad
bugfix to feed
2014-02-06 10:38:45 +05:30
Pratik Vyas
c6b59ef082
Merge branch 'develop'
2014-02-05 18:49:29 +05:30
Pratik Vyas
dbbba659a8
bumped to version 3.8.2
2014-02-05 19:19:29 +06:00
Nabin Hait
3c3719fa9c
Merge pull request #1388 from nabinhait/hotfix
...
Hotfix
2014-02-05 18:46:54 +05:30
Nabin Hait
a7af1d619e
Fix in accounts receivable report
2014-02-05 18:15:12 +05:30
Rushabh Mehta
307fac8b78
hooks fixes
2014-02-05 17:04:49 +05:30
Nabin Hait
18eb8c5f68
fixed unicode and null issue in sms center
2014-02-05 15:06:09 +05:30
Akhilesh Darjee
602fdc0000
patch reloading employee form
2014-02-03 19:32:59 +05:30
Akhilesh Darjee
f1c3537924
webnotes/erpnext#869 newsletter to send to employees
2014-02-03 19:28:36 +05:30
Akhilesh Darjee
81578d2e77
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-02-03 17:48:46 +05:30
Akhilesh Darjee
8f674fe0fb
minor changes
2014-02-03 17:47:50 +05:30
Akhilesh Darjee
abb3af7b30
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-02-03 16:44:14 +05:30
Rushabh Mehta
cc008cc109
commonified get_party_details
2014-02-03 16:14:56 +05:30
Rushabh Mehta
347889b233
merge
2014-02-03 14:49:53 +05:30
Rushabh Mehta
8ed0268b9d
fix to SalesInvoice format
2014-02-03 14:40:01 +05:30
Rushabh Mehta
fa799f7d81
Merge branch '4.0.0-cleanup' of github.com:webnotes/erpnext into 4.0.0-cleanup
2014-02-03 14:38:52 +05:30
Nabin Hait
23c28704d2
Field arrangement in child table
2014-02-03 14:36:59 +05:30
Akhilesh Darjee
dd905fcaba
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-02-03 13:56:10 +05:30
Akhilesh Darjee
53593c9c47
Newsletter allow delete
2014-02-03 13:40:27 +05:30
Rushabh Mehta
8612778136
style fix
2014-02-03 10:45:21 +05:30
Rushabh Mehta
9adcf85a14
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-02-03 10:44:34 +05:30
Akhilesh Darjee
d6d2193f91
newsletter reload
2014-01-31 19:59:25 +05:30
Nabin Hait
bec11fa86e
Newsletter permissions
2014-01-31 17:33:23 +05:30
Nabin Hait
dfae0ea570
minor fix in patch
2014-01-31 17:25:09 +05:30
Nabin Hait
d7fb6dce89
Stock reconciliation: cost center filters
2014-01-31 17:05:09 +05:30
Nabin Hait
759f9ee973
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-01-31 16:28:31 +05:30
Nabin Hait
646d06ee9f
Merge branch 'develop' of github.com:webnotes/erpnext into 4.0.0-wip
...
Conflicts:
config.json
2014-01-31 16:28:05 +05:30
Nabin Hait
7f80485070
Merge pull request #1374 from akhileshdarjee/sms-center
...
SMS center character count
2014-01-31 02:57:35 -08:00
Nabin Hait
45f0c25a6d
Merge pull request #1365 from akhileshdarjee/4.0-hotfix
...
Stay Updated button in website fixed
2014-01-31 02:44:35 -08:00
Nabin Hait
c3211ab394
Merge pull request #1368 from akhileshdarjee/default-tax
...
Default tax for customer and supplier
2014-01-31 02:40:51 -08:00
Akhilesh Darjee
dc45153430
webnotes/erpnext#1221 dont allow duplicate user id in employee
2014-01-31 12:23:13 +05:30
Akhilesh Darjee
4e3b601990
webnotes/erpnext#1188 sms center character count
2014-01-30 19:13:25 +05:30
Nabin Hait
b5be7bab9b
Stock Return: fetch customer and supplier details
2014-01-30 18:47:12 +05:30
Nabin Hait
8dc2c6a16c
Default accounts in company should not be copied
2014-01-30 17:00:09 +05:30
Pratik Vyas
fe977289eb
Merge branch 'develop'
2014-01-30 16:00:29 +05:30
Pratik Vyas
45b5b6d11f
bumped to version 3.8.1
2014-01-30 16:30:29 +06:00
Nabin Hait
ec43e4dd33
Merged with develop
2014-01-30 15:22:10 +05:30
Nabin Hait
c58b330673
Merge pull request #1372 from nabinhait/hotfix
...
Hotfix
2014-01-30 01:49:29 -08:00
Nabin Hait
5d976ca3ac
recurring invoice test fix
2014-01-30 15:12:39 +05:30
Rushabh Mehta
fcb6b01e4e
cleaned up email
2014-01-30 15:09:05 +05:30
Nabin Hait
f2f17959ab
Serial no fix
2014-01-30 14:54:25 +05:30
Akhilesh Darjee
e0a1039756
merge conflict fixed
2014-01-30 14:44:35 +05:30
Pratik Vyas
6448076143
Merge branch 'develop'
2014-01-30 13:59:43 +05:30
Pratik Vyas
3f657bcf51
bumped to version 3.8.0
2014-01-30 14:29:43 +06:00
Akhilesh Darjee
4cdb79941b
map charge to taxes and charges in transactions
2014-01-30 13:56:57 +05:30
Nabin Hait
0ff32e73ba
Merged with 4.0.0-wip
2014-01-30 12:41:52 +05:30
Nabin Hait
fe8db590a1
Fixed conflict while merging with develop
2014-01-30 12:32:47 +05:30
Nabin Hait
53f7ba26f6
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-30 12:12:50 +05:30
Nabin Hait
937103f840
Update accounts_receivable.py
2014-01-30 12:12:26 +05:30
Nabin Hait
1969f9e1ac
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-30 12:11:04 +05:30
Nabin Hait
60fcce66f7
Minor fix in accounts receivable report
2014-01-30 12:08:44 +05:30
Nabin Hait
47fcc0310d
Merge pull request #1371 from nabinhait/hotfix
...
Minor fix in opening purchase invoice and AR report
2014-01-29 22:13:29 -08:00
Nabin Hait
7e676f3aae
Merge pull request #1370 from akhileshdarjee/hotfix
...
Shipping address in quotation fixed for customer validation
2014-01-29 21:50:49 -08:00
Akhilesh Darjee
30aac9bbcf
removed contact person for lead filter
2014-01-30 11:02:06 +05:30
Nabin Hait
c2a5858143
Minor fix in accounts receivable report
2014-01-30 10:50:55 +05:30
Nabin Hait
879b3a0cbc
Set expense account for perpetual inventory only non-opening invoices
2014-01-30 10:50:55 +05:30
Akhilesh Darjee
ef0a0e8209
stashed footer page
2014-01-29 20:18:43 +05:30
Akhilesh Darjee
f7f20f624a
shipping address in quotation fixed for customer validation
2014-01-29 20:13:43 +05:30
Nabin Hait
b87e9f2651
Fixes in fetching party details
2014-01-29 19:51:36 +05:30
Akhilesh Darjee
b665d86292
patch to reload all sales and purchase doctypes and print formats
2014-01-29 17:40:34 +05:30
Akhilesh Darjee
4f7215662d
webnotes/erpnext#1090 set default tax type in customer and supplier
2014-01-29 16:31:38 +05:30
Akhilesh Darjee
db22657d93
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into default-tax
2014-01-29 16:00:33 +05:30
Rushabh Mehta
24da761a17
more updates to party
2014-01-29 15:26:04 +05:30
Nabin Hait
115dcc09d4
Merge pull request #1361 from trhura/develop
...
Pull request for issue #856
2014-01-29 00:30:07 -08:00
Thura Hlaing
990d7c4862
added StockFreezeError, and uncomment stock_auth_role check
2014-01-29 14:53:21 +06:30
Thura Hlaing
166024a23c
Merge branch 'develop' of https://github.com/webnotes/erpnext into develop
2014-01-29 13:29:27 +06:30
Thura Hlaing
3c4bb0c7c9
initial tests for freeze stock functionality
2014-01-29 13:28:11 +06:30
Thura Hlaing
258191ab40
fix bug by coercing stock_frozen_upto_days value to int
2014-01-29 11:37:30 +06:30
Thura Hlaing
d66396abe3
fixed typo add_date -> add_days
2014-01-29 09:49:30 +06:30
Akhilesh Darjee
2ced3b07d4
changed fieldname from charge to taxes
2014-01-28 19:16:05 +05:30
Rushabh Mehta
49dd7bee87
added get_supplier_details and commonified invoice functions
2014-01-28 17:43:10 +05:30
Rushabh Mehta
3b432dce88
added listviews
2014-01-28 16:10:15 +05:30
Nabin Hait
21d324c597
Merged with 4.0-wip
2014-01-28 15:52:25 +05:30
Akhilesh Darjee
a7ab20ec78
webnotes/erpnext#912 Stay Updated button in website fixed
2014-01-28 15:50:28 +05:30
Akhilesh Darjee
7c1976950d
webnotes/erpnext#912 stay updated button fixed in website
2014-01-28 13:03:47 +05:30
Nabin Hait
158200b209
Merge pull request #1363 from akhileshdarjee/hotfix
...
Allow renaming of Sales/Purchase Taxes and Charges Master
2014-01-27 23:13:03 -08:00
Akhilesh Darjee
a570cd66f7
webnotes/erpnext#1362 allow renaming of sales and purchase taxes and charges master
2014-01-28 12:31:12 +05:30
Thura Hlaing
d7f3d63a8e
Merge branch 'develop' of https://github.com/webnotes/erpnext into develop
2014-01-28 09:10:20 +06:30
Thura Hlaing
2e67426936
label/message update in error reporting
2014-01-28 09:09:50 +06:30
Thura Hlaing
16f88ba3cd
import add_date, removed timedelta import
2014-01-27 20:22:08 +06:30
Thura Hlaing
e31a41854b
tabify modifications, minor coding style/message updates
2014-01-27 20:14:53 +06:30
Pratik Vyas
7349c191ab
Merge branch 'develop'
2014-01-27 17:49:50 +05:30
Pratik Vyas
dc540dda4d
bumped to version 3.7.1
2014-01-27 18:19:50 +06:00
Nabin Hait
4b97811941
Merge pull request #1359 from akhileshdarjee/4.0-hotfix
...
POS Invoice print format showing inclusive taxes and discount amount
2014-01-27 04:09:36 -08:00
Nabin Hait
5c494f79f3
Merge pull request #1360 from nabinhait/hotfix
...
Planned qty patch: auto commit on many writes
2014-01-27 04:07:43 -08:00
Nabin Hait
191935bbf5
Planned qty patch: auto commit on many writes
2014-01-27 17:37:06 +05:30
Akhilesh Darjee
ffa4769b51
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-01-27 17:32:32 +05:30
Akhilesh Darjee
db4304914c
POS Invoice print format showing inclusive taxes and discount amount
2014-01-27 17:27:39 +05:30
Nabin Hait
db7901ec49
Merge pull request #1261 from akhileshdarjee/maintenance2
...
Fixed Maintenance Schedule
2014-01-27 03:57:15 -08:00
Pratik Vyas
8c78a1abb7
Merge branch 'develop'
2014-01-27 17:19:45 +05:30
Pratik Vyas
8821541f33
bumped to version 3.7.0
2014-01-27 17:49:45 +06:00
Nabin Hait
5cec7ec84a
Merge pull request #1355 from akhileshdarjee/hotfix
...
Allow rename for price list
2014-01-27 02:40:08 -08:00
Thura Hlaing
9d5566634c
changed stock_frozen_upto to stock_frozen_upto_days, and added validation for it in stock ledger
2014-01-27 16:54:38 +06:30
Akhilesh Darjee
86894f3bbf
merge conflict fixed
2014-01-27 15:42:02 +05:30
Nabin Hait
9536f112b5
Merge pull request #1358 from nabinhait/hotfix
...
Serial no and planned qty
2014-01-27 01:33:56 -08:00
Nabin Hait
44a40b860e
Fixed planned qty bug and patch to recalculate planned qty
2014-01-27 15:02:30 +05:30
Nabin Hait
b3d26c08f6
Fixed planned qty bug and patch to recalculate planned qty
2014-01-27 14:58:55 +05:30
Thura Hlaing
98d4622ed8
Merge branch 'develop' of github.com:trhura/erpnext
2014-01-27 14:10:52 +06:30
Thura Hlaing
24b26db327
initial prototype implementation for issue #856
2014-01-27 14:08:55 +06:30
Nabin Hait
fa9fabaa49
Serial no status fix: patch to set status not available where no sle exists
2014-01-27 12:46:18 +05:30
Akhilesh Darjee
49e8e783e3
webnotes/erpnext#1353 allow rename for price list
2014-01-27 11:12:24 +05:30
Rushabh Mehta
1230e3a28b
don't hide customer / supplier links, webnotes/erpenxt#796
2014-01-27 11:02:27 +05:30
Anand Doshi
c4ee74857d
BugFix: Production Planning Tool - get_raw_materials
2014-01-24 21:53:11 +05:30
Anand Doshi
3f8f4ff6cd
BugFix: Production Planning Tool - get_raw_materials
2014-01-24 21:47:01 +05:30
Anand Doshi
cb39e0878e
Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
...
Conflicts:
config.json
erpnext/accounts/utils.py
erpnext/patches/patch_list.py
erpnext/stock/doctype/price_list/price_list.txt
erpnext/stock/doctype/warehouse/warehouse.py
portal/templates/sale.html
portal/utils.py
selling/doctype/sales_order/templates/pages/order.py
selling/utils/cart.py
selling/utils/product.py
utilities/demo/demo_docs/Fiscal_Year.csv
utilities/demo/make_demo.py
2014-01-24 21:44:36 +05:30
Akhilesh Darjee
a4e0a1c061
minor changes
2014-01-24 19:57:52 +05:30
Anand Doshi
fc13b87fd5
Fixes in Make Demo
2014-01-24 18:54:50 +05:30
Anand Doshi
d9ba544e09
Fix in Item Test Case
2014-01-24 15:59:05 +05:30
Rushabh Mehta
2fa914b410
Merge pull request #1347 from akhileshdarjee/4.0-hotfix
...
method name fixing
2014-01-24 02:07:22 -08:00
Rushabh Mehta
e288e5238a
added title_fields for Task, Newsletter
2014-01-24 15:33:42 +05:30
Akhilesh Darjee
7cbf5b4e67
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-01-24 11:12:50 +05:30
Akhilesh Darjee
44edfb7231
method name fixing
2014-01-24 11:10:46 +05:30
Rushabh Mehta
1cd96a136f
updates for restriction
2014-01-24 11:10:24 +05:30
Nabin Hait
af21479665
Merge pull request #1342 from akhileshdarjee/hotfix
...
Item List refresh when price list changed in POS
2014-01-23 05:14:16 -08:00
Nabin Hait
93eab5521c
Minor fix in path
2014-01-23 17:58:03 +05:30
Nabin Hait
4ba95d0b7a
Fix in testcases
2014-01-23 16:45:22 +05:30
Nabin Hait
5ae6a61c4d
Fixes related to appifing shopping cart
2014-01-23 15:33:30 +05:30
Nabin Hait
eec59ae7c4
Merge pull request #1345 from nabinhait/hotfix
...
Order preview through customer login
2014-01-23 01:48:28 -08:00
Nabin Hait
efa9a7ed5b
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-23 13:25:39 +05:30
Nabin Hait
557abdebe0
order preview through customer login
2014-01-23 13:25:26 +05:30
Akhilesh Darjee
8589b1db22
Use model set_value for updating values from POS
2014-01-22 19:25:51 +05:30
Akhilesh Darjee
82a21beba0
Item List refresh when price list changed in POS
2014-01-22 16:55:32 +05:30
Pratik Vyas
256c4da0a5
Merge branch 'develop'
2014-01-22 16:03:07 +05:30
Pratik Vyas
7395dc9969
bumped to version 3.6.6
2014-01-22 16:33:07 +06:00
Nabin Hait
6a23cfa5cd
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-01-22 15:57:32 +05:30
Nabin Hait
d39bc09e62
Merge pull request #1341 from nabinhait/hotfix
...
Small fix
2014-01-22 02:21:17 -08:00
Nabin Hait
c7676797e1
Dont display old fraction outstanding in AR report
2014-01-22 15:36:44 +05:30
Rushabh Mehta
7460dcf406
updated Bootstrap
2014-01-22 12:44:46 +05:30
Nabin Hait
423932fab2
Fixes in general ledger opening
2014-01-22 11:53:44 +05:30
Nabin Hait
efda5b0d36
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-21 20:58:10 +05:30
Nabin Hait
13a9e27320
Fixes in warehouse merge function
2014-01-21 20:57:39 +05:30
Pratik Vyas
b0433d96a3
Merge branch 'develop'
2014-01-21 12:09:31 +05:30
Pratik Vyas
f3aba2e536
bumped to version 3.6.5
2014-01-21 12:39:31 +06:00
Nabin Hait
1594f102fd
Merge pull request #1340 from nabinhait/hotfix
...
General ledger
2014-01-20 22:29:33 -08:00
Nabin Hait
b2f2df4c64
General ledger: opening balance issue fixed
2014-01-21 11:58:17 +05:30
Nabin Hait
9f6c48d82e
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-21 10:44:16 +05:30
Pratik Vyas
f0307dc75e
Merge branch 'develop'
2014-01-20 19:21:25 +05:30
Pratik Vyas
872e4d1f3d
bumped to version 3.6.4
2014-01-20 19:51:25 +06:00
Nabin Hait
b164e606f9
Merge pull request #1337 from nabinhait/hotfix
...
Hotfix
2014-01-20 05:00:43 -08:00
Nabin Hait
806343395a
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-20 18:29:48 +05:30
Nabin Hait
afe93d633c
Increased remarks width in general ledger
2014-01-20 18:28:48 +05:30
Nabin Hait
cd20717c3d
Merge pull request #1336 from akhileshdarjee/disable-price-list
...
Enabled feature for Price List
2014-01-20 04:47:10 -08:00
Rushabh Mehta
f96bcf943b
added explicit delete perimssions
2014-01-20 17:52:13 +05:30
Nabin Hait
9e056ec1ce
Auto closing of tickets through schedulers
2014-01-20 17:46:37 +05:30
Rushabh Mehta
cef681942f
merge fix
2014-01-20 17:41:13 +05:30
Nabin Hait
5c6d13a0df
Fixed conflict while merging with develop branch
2014-01-20 17:18:16 +05:30
Nabin Hait
719f2803b3
Fixed conflict while merging with develop branch
2014-01-20 17:01:28 +05:30
Nabin Hait
dc15b4fa8a
Fixed conflict while merging with develop brnach
2014-01-20 16:48:49 +05:30
Akhilesh Darjee
529709e08b
patch for enabling all price list
2014-01-20 16:39:03 +05:30
Akhilesh Darjee
e82eee512b
Enabled feature in Price List
2014-01-20 16:09:45 +05:30
Nabin Hait
ee0c623760
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-20 10:57:12 +05:30
Nabin Hait
dbb4955483
Merge pull request #1332 from akhileshdarjee/hotfix
...
decimal places fix in item prices report
2014-01-17 20:18:30 -08:00
Akhilesh Darjee
ed87335513
decimal places fix in item prices report
2014-01-17 18:57:21 +05:30
Akhilesh Darjee
8a4111fe0e
decimal places fixed in item prices report
2014-01-17 18:50:44 +05:30
Pratik Vyas
4bfa8d560b
Merge branch 'develop'
2014-01-17 16:56:31 +05:30
Pratik Vyas
96db41d996
bumped to version 3.6.3
2014-01-17 17:26:31 +06:00
Nabin Hait
9a74330d6f
Merge pull request #1330 from pdvyas/fix-mysql-installer
...
remove mysql-python pinning to 1.2.4
2014-01-17 02:37:25 -08:00
Nabin Hait
1951baca57
Merge pull request #1319 from pdvyas/about-version
...
update about erpnext with version number
2014-01-17 02:36:11 -08:00
Pratik Vyas
da08124df2
remove mysql-python pinning to 1.2.4
2014-01-17 15:27:19 +05:30
Nabin Hait
2aecc5a717
Merge pull request #1329 from nabinhait/hotfix
...
Patch for updating billing status for old zero value order
2014-01-17 01:41:40 -08:00
Nabin Hait
a37ffe162b
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-17 12:05:06 +05:30
Nabin Hait
bc99c9d6e0
Priority to user's deafult price list over customer's default price list
2014-01-17 12:04:24 +05:30
Nabin Hait
f32314dd0b
Do not set income/expense account automatically in company master
2014-01-17 11:53:25 +05:30
Nabin Hait
7e73f35916
Merge pull request #1327 from akhileshdarjee/hotfix
...
Allow renaming of campaign
2014-01-16 21:48:10 -08:00
Akhilesh Darjee
e1e63a91d6
Allow renaming of campaign
2014-01-17 11:12:20 +05:30
Nabin Hait
9a05aad8ea
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-17 10:31:43 +05:30
Nabin Hait
f6b77479d7
Patch: Update billing status for zero value order
2014-01-16 18:18:49 +05:30
Pratik Vyas
3c279163fc
Merge branch 'develop'
2014-01-16 16:29:22 +05:30
Pratik Vyas
6933617538
bumped to version 3.6.2
2014-01-16 16:59:22 +06:00
Nabin Hait
2648661757
Merge pull request #1326 from nabinhait/hotfix
...
Calculate taxes and charges total in server side
2014-01-16 01:28:33 -08:00
Nabin Hait
e31a97f355
Calculate taxes and charges total in server side
2014-01-16 14:24:32 +05:30
Nabin Hait
6bdb73c392
Merge pull request #1324 from nabinhait/hotfix
...
Minor Fix
2014-01-15 22:44:25 -08:00
Nabin Hait
deda7e2c75
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-16 12:08:36 +05:30
Nabin Hait
5cdb8cea13
Reset filters in Item Price report on each route
2014-01-16 12:08:12 +05:30
Nabin Hait
90a8c9e636
Merge pull request #1323 from nabinhait/hotfix
...
Billing status for zero value SO/PO
2014-01-15 05:20:51 -08:00
Nabin Hait
c0c951b6a9
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-15 17:36:34 +05:30
Nabin Hait
39eb7faeb9
Update billing percentage and status from SI/PI in SO/PO, when net total is zero
2014-01-15 17:36:18 +05:30
Nabin Hait
4829ad3eb8
Merge pull request #1321 from akhileshdarjee/hotfix
...
Hide fields fix
2014-01-15 03:17:23 -08:00
Akhilesh Darjee
a682d45846
webnotes/erpnext # 1320 - hide fields fix
2014-01-15 16:39:01 +05:30
Pratik Vyas
76dd468f0e
update about erpnext with version number
2014-01-15 14:23:38 +05:30
Nabin Hait
a6df26839d
Higher priority to user's default price list over customer's default price list
2014-01-15 12:21:14 +05:30
Akhilesh Darjee
2a79b00700
minor fix
2014-01-15 11:54:05 +05:30
Akhilesh Darjee
6a749e3a8e
removed while loop
2014-01-15 11:43:47 +05:30
Nabin Hait
c5d4fc38aa
Fixes in monthly salary register
2014-01-15 10:54:07 +05:30
Pratik Vyas
02f7e83bd1
Merge branch 'develop'
2014-01-14 18:49:14 +05:30
Pratik Vyas
f55d9414cd
bumped to version 3.6.1
2014-01-14 19:19:14 +06:00
Nabin Hait
5644ed37a4
Merge pull request #1316 from nabinhait/hotfix
...
rounding and divisional loss
2014-01-14 05:05:33 -08:00
Nabin Hait
ee6200576a
Highest priority to user properties while fetching warehouse from item
2014-01-14 18:34:10 +05:30
Nabin Hait
eeb8ba18cd
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-14 17:44:47 +05:30
Nabin Hait
3a19370892
Rounding issue and divisional loss adjustment
2014-01-14 17:44:34 +05:30
Nabin Hait
6dc1ba6f7f
Merge pull request #1314 from nabinhait/hotfix
...
comment fix
2014-01-14 02:29:39 -08:00
Nabin Hait
d91af2853e
Allowed import for customer issue
2014-01-14 15:56:52 +05:30
Nabin Hait
d23ae108ae
Fixes in Comment, if comment by not mentioned, consider owner
2014-01-14 15:52:09 +05:30
Anand Doshi
b9b6a6cea5
Moved webnotes scheduler event hooks
2014-01-13 21:22:23 +05:30
Pratik Vyas
72f8ae2d5a
Merge branch 'develop'
2014-01-13 18:37:07 +05:30
Pratik Vyas
1e347910d5
bumped to version 3.6.0
2014-01-13 19:07:07 +06:00
Nabin Hait
25cfb700bb
Merge pull request #1311 from akhileshdarjee/hotfix
...
Increase and decrease quantity buttons in POS
2014-01-13 04:33:50 -08:00
Nabin Hait
8d2d4e82fd
Merge pull request #1302 from nabinhait/hotfix
...
Hotfix
2014-01-13 04:33:18 -08:00
Nabin Hait
c43d58ac79
Delete Property Setters for Custom Fields, and set them inside Custom Field
2014-01-13 17:55:24 +05:30
Akhilesh Darjee
0b3c10601c
Increase and decrease quantity buttons in POS
2014-01-13 13:34:34 +05:30
Nabin Hait
14bf711d04
Fixes in frozen accounts validation
2014-01-13 13:28:07 +05:30
Nabin Hait
35a9d585b4
Bank Reconciliation Statement: Show balance in debit or credit column based on account type
2014-01-13 12:24:27 +05:30
Nabin Hait
38e56eeb45
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
2014-01-13 12:23:29 +05:30
Nabin Hait
3dd1043d5e
Merge pull request #1301 from akhileshdarjee/hotfix
...
pos view showing inclusive taxes
2014-01-10 03:09:12 -08:00
Nabin Hait
55387aa931
Fixed conflict
2014-01-10 16:31:48 +05:30
Nabin Hait
03463ef73b
Move related property setters to custom field property
2014-01-10 16:28:41 +05:30
Akhilesh Darjee
371663169c
pos view showing inclusive taxes
2014-01-10 15:05:44 +05:30
Nabin Hait
f3ded044e0
Monthly Salary Register: Month is now optional
2014-01-09 17:38:50 +05:30
Nabin Hait
68b0d54b4b
Set default accounts in company related to perpetual inventory, only it is enabled
2014-01-09 17:25:55 +05:30
Nabin Hait
95e45574cb
Merge pull request #1239 from akhileshdarjee/flat-discount
...
Flat Discount on Sales Cycle
2014-01-09 03:43:35 -08:00
Pratik Vyas
e4a71935eb
Merge branch 'develop'
2014-01-09 15:56:53 +05:30
Pratik Vyas
3e846d19d4
bumped to version 3.5.1
2014-01-09 16:26:53 +06:00
Nabin Hait
5411ece766
Merge pull request #1299 from nabinhait/hotfix
...
Accounts Receivable fix for partial payment in pos
2014-01-09 02:25:12 -08:00
Nabin Hait
aeb68b2899
Accounts Receivable fix for partial payment in pos
2014-01-09 15:54:18 +05:30
Pratik Vyas
0064dc6f4a
Merge branch 'develop'
2014-01-09 15:52:09 +05:30
Pratik Vyas
11bf06ad76
bumped to version 3.5.0
2014-01-09 16:22:09 +06:00
Nabin Hait
5c6a2acff7
Merge pull request #1298 from nabinhait/hotfix
...
Accounts Receivable fix for partial payment in pos
2014-01-09 02:20:06 -08:00
Nabin Hait
cdbd4218a8
Accounts Receivable fix for partial payment in pos
2014-01-09 15:49:26 +05:30
Nabin Hait
701cddfb15
Merge pull request #1297 from nabinhait/hotfix
...
Hotfix
2014-01-08 23:18:54 -08:00
Nabin Hait
4bbf91bea1
Added match condition in general ledger report
2014-01-09 12:44:44 +05:30
Nabin Hait
e481e81e67
Merge pull request #1296 from akhileshdarjee/hotfix
...
POS print format fixed
2014-01-08 22:23:56 -08:00
Anand Doshi
102b417b52
Fix: Typo on patch
2014-01-09 11:39:10 +05:30
Akhilesh Darjee
efc2a45835
merge conflict fixed
2014-01-08 19:42:17 +05:30
Akhilesh Darjee
5c119a7e95
Merge branch 'master' of github.com:webnotes/erpnext into hotfix
2014-01-08 19:36:26 +05:30
Akhilesh Darjee
f7a102ffe3
POS print format fixed
2014-01-08 19:35:01 +05:30
Nabin Hait
d659343541
Payment Reconciliation: Fix for outstanding voucher query
2014-01-08 17:29:23 +05:30
Nabin Hait
dbf5e54eab
Merge pull request #1290 from akhileshdarjee/price-list
...
Price List and Item Price : Valid for Buying and Selling as separate check box
2014-01-07 21:49:52 -08:00
Pratik Vyas
5eb139a531
Merge branch 'develop'
2014-01-07 21:45:04 +05:30
Pratik Vyas
9e2358c544
bumped to version 3.4.9
2014-01-07 22:15:04 +06:00
Akhilesh Darjee
8d0ef21911
pos invoice print format changes
2014-01-07 19:45:33 +05:30
Pratik Vyas
9a8f37c579
Merge pull request #1289 from pdvyas/hotfix-installer
...
fix installer python packages issue
2014-01-07 06:14:08 -08:00
Akhilesh Darjee
029f698c65
patch for item price and price list
2014-01-07 19:43:35 +05:30
Akhilesh Darjee
806017c92a
Price List and Item Price : Validfor Buying and Selling as separate check box
2014-01-07 18:37:38 +05:30
Pratik Vyas
69951e5d1c
fix installer python packages issue
2014-01-07 18:24:40 +05:30
Nabin Hait
10fd91c78e
Close tickets automatically through scheduler
2014-01-07 16:18:41 +05:30
Pratik Vyas
63d71d7f2f
Merge branch 'develop'
2014-01-07 13:47:44 +05:30
Pratik Vyas
777bff6e8d
bumped to version 3.4.8
2014-01-07 14:17:44 +06:00
Nabin Hait
1e42a3d028
Merge pull request #1287 from nabinhait/hotfix
...
Fixes in overbilling validation against DN/PR
2014-01-06 23:12:45 -08:00
Nabin Hait
da282d405f
Fixes in overbilling validation against DN/PR
2014-01-07 12:41:09 +05:30
Nabin Hait
8f1bb82ab9
Merge pull request #1286 from nabinhait/hotfix
...
Removed unwanted debug
2014-01-06 22:40:54 -08:00
Anand Doshi
f2b46635b5
Merge pull request #1285 from pdvyas/hotfix-installer
...
fix branching, pip version and mysql-python version pinning in install_erpnext
2014-01-06 22:35:49 -08:00
Pratik Vyas
a11e14424c
fix branching, pip version and mysql-python version pinning in install_erpnext
2014-01-07 12:03:09 +05:30
Nabin Hait
01441ef37f
Removed unwanted debug
2014-01-07 11:59:36 +05:30
Nabin Hait
f6cf5e0f43
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-cleanup
2014-01-06 17:36:04 +05:30
Nabin Hait
cb665285db
Merge pull request #1280 from nabinhait/hotfix
...
Fixes in item-wise sales/purchase register
2014-01-06 03:03:02 -08:00
Nabin Hait
6b66c387ad
Fixes in item-wise sales/purchase register
2014-01-06 16:28:17 +05:30
Nabin Hait
5e702de710
Merge pull request #1279 from akhileshdarjee/hotfix
...
accounts payable fixed
2014-01-05 23:01:51 -08:00
Akhilesh Darjee
7e79f300a1
accounts payable fixed
2014-01-06 12:23:29 +05:30
Pratik Vyas
955902ccad
Merge branch 'develop'
2014-01-06 12:18:58 +05:30
Pratik Vyas
b882fa14f4
bumped to version 3.4.7
2014-01-06 12:48:58 +06:00
Nabin Hait
d12d7142c6
Merge pull request #1278 from nabinhait/hotfix
...
Fixes in overbilling validation
2014-01-05 22:35:10 -08:00
Nabin Hait
42db5d76a9
Fixes in overbilling validation
2014-01-06 11:20:37 +05:30
Akhilesh Darjee
5dd92fd5d6
reload doc in maintenance schedule
2014-01-03 19:14:01 +05:30
Pratik Vyas
bd4030bf85
Merge branch 'develop'
2014-01-03 18:40:11 +05:30
Pratik Vyas
a83337a2dd
bumped to version 3.4.6
2014-01-03 19:10:11 +06:00
Nabin Hait
e51e5238ec
Merge pull request #1267 from nabinhait/hotfix
...
Hotfix
2014-01-03 04:59:34 -08:00
Nabin Hait
5d5fe5d9d5
Cost center field added in Purchase Receipt Item table
2014-01-03 18:28:53 +05:30
Akhilesh Darjee
e27717261d
merge conflict fixed
2014-01-03 18:18:31 +05:30
Akhilesh Darjee
57738a0ff3
flat discount replaced to discount amount
2014-01-03 18:15:07 +05:30
Nabin Hait
b476c989a4
Fixes test cases for date and year mismatch
2014-01-03 17:43:52 +05:30
Nabin Hait
7f0406f281
Chekc over billing validation considering tolerance
2014-01-03 17:43:19 +05:30
Nabin Hait
33f6b9d6e8
Unlinked message listing all linked entries while cancelling an accounting trandsaction
2014-01-03 15:12:16 +05:30
Akhilesh Darjee
5c96b75a68
fixed maintenance schedule
2014-01-02 17:54:12 +05:30
Akhilesh Darjee
064d2ba16a
fixed sr no in maintenance schedule
2014-01-02 17:47:32 +05:30
Rushabh Mehta
b09d9dabc5
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
2014-01-02 11:47:23 +05:30
Nabin Hait
06720dfb90
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-01-01 10:47:18 +05:30
Nabin Hait
a2e0a9b05f
Fliend rearrangemet in tables
2014-01-01 10:45:42 +05:30
Rushabh Mehta
3f7e2729bb
removed demo hooks
2014-01-01 10:45:26 +05:30
Nabin Hait
6260b58a0a
Merge pull request #1253 from nabinhait/4.0.0-wip
...
4.0.0 wip
2013-12-31 21:13:45 -08:00
Anand Doshi
2511aa2b14
Merge pull request #1254 from anandpdoshi/4.0.0-shopping-cart-wip
...
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixe...
2013-12-31 04:14:15 -08:00
Anand Doshi
9a4a13cb73
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
2013-12-31 17:38:21 +05:30
Nabin Hait
139aa71666
Fixed conflict while merging with master
2013-12-31 16:09:22 +05:30
Nabin Hait
d3f04d754a
General ledger path fixed
2013-12-31 16:04:48 +05:30
Nabin Hait
432b86344e
Validate account with reference voucher if against voucher mentioned
2013-12-31 15:07:58 +05:30
Akhilesh Darjee
829eda47a8
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount
2013-12-30 12:31:07 +05:30
Anand Doshi
0663ec4a9c
Merge fixes: removed patches, removed Warehouse User
2013-12-27 18:00:28 +05:30
Rushabh Mehta
61bf425935
deleted moves
2013-12-27 17:58:39 +05:30
Akhilesh Darjee
d203aea7c2
[flat discount] flat discount implemented on sales cycle
2013-12-27 17:49:57 +05:30
Rushabh Mehta
c4a0ed63ef
Moved demo to separate app, moved patches folder
2013-12-27 17:30:24 +05:30
Akhilesh Darjee
31ccf9a80b
[flat discount] fixed test cases for stock entry
2013-12-27 14:21:39 +05:30
Rushabh Mehta
4ac68952e8
Moved patches and fixed method routing in pages
2013-12-27 13:43:40 +05:30
Anand Doshi
e7fc25d6a8
Fixes after permissions merge
2013-12-27 10:49:28 +05:30
Rushabh Mehta
0527a393aa
Merge pull request #1236 from anandpdoshi/permissions
...
Permissions
2013-12-26 21:07:54 -08:00
Akhilesh Darjee
2b1d8854d5
[flat discount] added flat discount in pos
2013-12-26 20:31:42 +05:30
Anand Doshi
8e332ffd16
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
...
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
2013-12-26 19:12:51 +05:30
Akhilesh Darjee
3ab9f24a12
Merge branch 'master' of github.com:webnotes/erpnext into flat_discount
2013-12-26 18:15:14 +05:30
Akhilesh Darjee
13fa595282
[flat discount] pos print format fixed
2013-12-26 18:14:44 +05:30
Akhilesh Darjee
aebb844da9
[flat discount] added flat discount in print format and all selling doctypes
2013-12-26 18:05:41 +05:30
Rushabh Mehta
7334bea3c2
fixed languages, moved framework strings to framework
2013-12-26 14:44:08 +05:30
Rushabh Mehta
caa4380d49
Merge with 3.3.8
2013-12-26 11:07:58 +05:30
Rushabh Mehta
54047780fc
Merge with 3.3.8
2013-12-26 11:07:46 +05:30
Akhilesh Darjee
c53dbc7cdf
[flat discount] implemented flat discount on client side
2013-12-25 19:46:20 +05:30
Rushabh Mehta
4b6b377134
Removed config.json
2013-12-25 17:38:12 +05:30
Rushabh Mehta
df200f305b
Redesigned templates. Now all templates must be inside templates/pages templates/generators
2013-12-25 15:19:22 +05:30
Akhilesh Darjee
63aa5fd673
[flat discount] implemented flat discount on server side
2013-12-24 20:30:03 +05:30
Rushabh Mehta
3c68488873
Fixes to setup wizard
2013-12-24 18:51:49 +05:30
Rushabh Mehta
30fb30cffb
Merge pull request #1 from pdvyas/testing
...
add travis ci
2013-12-24 05:21:21 -08:00
Pratik Vyas
f437e867fd
add travis ci
2013-12-24 12:17:59 +05:30
Anand Doshi
2926651e1c
Restrict Employee and Leave Approver to relevant Employee and Leave Application records
2013-12-23 20:01:20 +05:30
Anand Doshi
9b67f4344b
Patch to migrate allow_print and allow_email to print and email rights of DocPerm
2013-12-23 20:01:20 +05:30
Anand Doshi
68852f25b5
Added rights for print and email in DocPerm
2013-12-23 20:01:20 +05:30
Anand Doshi
8a436500f0
[refactor] Client-side permission handling
2013-12-23 20:01:19 +05:30
Anand Doshi
2298d59b8b
[patch] new permission system
2013-12-23 20:01:19 +05:30
Anand Doshi
620145c59a
[minor] patches for restriction
2013-12-23 20:01:19 +05:30
Anand Doshi
bcf2422848
[minor] user properties and leave application
2013-12-23 20:01:19 +05:30
Anand Doshi
83638b5f05
[minor] move warehouse user to restrictions
2013-12-23 20:01:18 +05:30
Rushabh Mehta
57518fc5f1
[cleanup] [minor] default+cache related
2013-12-23 20:01:18 +05:30
Rushabh Mehta
fea93d0f65
[cleanup] [minor] added webnotes.model.delete_doc (module)
2013-12-23 20:01:18 +05:30
Rushabh Mehta
b1ea6b1f66
[permissions] Added Test Cases
2013-12-23 20:01:18 +05:30
Rushabh Mehta
497d363fc1
[permission model] Redesign
...
Conflicts:
patches/patch_list.py
2013-12-23 20:01:18 +05:30
Rushabh Mehta
b63d550a70
Added Applications page and fixed issues in translations and hooks
2013-12-23 16:09:00 +05:30
Akhilesh Darjee
b09dc46e68
[flat discount] first commit
2013-12-23 15:49:08 +05:30
Rushabh Mehta
2b08985e16
Translations redesigned webnotes/wnframework#351
2013-12-19 18:27:48 +05:30
Rushabh Mehta
91e9822f65
fixed test cases webnotes/wnframework#351
2013-12-16 18:43:42 +05:30
Rushabh Mehta
c652a6254f
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
2013-12-16 12:48:38 +05:30
Rushabh Mehta
30430796c7
notifications via hooks webnotes/wnframework#351
2013-12-13 15:33:40 +05:30
Rushabh Mehta
6de403f2be
added manifest, hooks and fixed requires webnotes/wnframework#351
2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d
install, web serving, session booting webnotes/wnframework#351
2013-12-12 19:12:19 +05:30
Rushabh Mehta
d2dd83c3a3
fixed template loader webnotes/wnframework#351
2013-12-12 13:57:58 +05:30
Pratik Vyas
1b23208779
[minor] get bundle working, almost
2013-12-12 10:44:38 +05:30
Rushabh Mehta
39bb8e2ed4
step 0: install
2013-12-11 15:32:14 +05:30
Rushabh Mehta
e460aa277b
added setup.py
2013-12-11 11:32:21 +05:30
Rushabh Mehta
b234a3545a
moved config.json inside erpnext
2013-12-11 10:55:55 +05:30
Rushabh Mehta
afea58b7a1
moved modules inside erpnext folder
2013-12-11 10:43:52 +05:30