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
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
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
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
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
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
bf4f99adf1
[learn] added modules #3841
2015-08-10 13:21:57 +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
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
Rushabh Mehta
5f7166de83
[minor] remove section break in opportunity
2015-08-10 11:30:47 +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
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
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
Nabin Hait
0e1314c5b5
[fix] serial no validation in return entry
2015-08-04 15:22:48 +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
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
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
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
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
69588f57e7
bumped to version 5.4.2
2015-07-30 17:17:48 +06:00
Nabin Hait
c330a49e9d
[hotfix] item search in production order
2015-07-30 16:45:58 +05:30
Nabin Hait
6f5815838e
bumped to version 5.4.1
2015-07-30 15:29:01 +06:00
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
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
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
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
d1dc622914
[fix][patch] Reload Leave Type
2015-07-29 16:37:02 +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
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
