tunde
690de64734
Merge branch 'develop' into issue-9166
2017-06-28 13:37:04 +01:00
tunde
c7e3a09cfb
adds if statement for reference_type === "Asset"
2017-06-28 13:23:18 +01:00
rohitwaghchaure
4b33b7e1c1
Merge pull request #9418 from nick9822/nick9822-patch-3
...
Removed "Asset" filter on payment account
2017-06-28 16:38:21 +05:30
Makarand Bauskar
5d8803b23e
Merge pull request #9435 from rmehta/gst
...
GST (India) Setup and Invoices #8711
2017-06-27 11:44:33 +05:30
nick9822
82e816054e
Added report_type to payment account filter
2017-06-26 15:29:44 +05:30
Makarand Bauskar
4eced4acec
Merge pull request #9445 from rohitwaghchaure/column_width_issue_bank_reco
...
[minor] Fix grid column of the Bank Reconciliation
2017-06-23 17:24:50 +05:30
Rohit Waghchaure
8326028d33
Don't validate delivery note and sales order required for the POS invoice
2017-06-23 12:56:12 +05:30
Rohit Waghchaure
666d004b40
[minor] Fix grid column of the Bank Reconciliation
2017-06-23 12:10:21 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
Makarand Bauskar
e995371b08
Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
...
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
nick9822
881491cd2b
Removed "Asset" filter on payment account
2017-06-21 19:51:08 +05:30
Vishal Dhayagude
310d4dc9e0
UOM column in Batch Wise Balance History Report ( #9359 )
...
* Training Events/Results link to employee dashbord
* [minor]Improve validation message for Buying / Selling Setting
* [minor]Added UOM cloumn in Batch Wise Balance History Report
* modified validation message for buying / selling setting
2017-06-20 13:02:35 +05:30
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rohit Waghchaure
6945d0dd8a
fixed test cases
2017-06-20 10:21:33 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
Charles-Henri Decultot
2305eda82e
Addition of new fields for POS Profile in Sales Invoice and POS Profile User link modification ( #9339 )
2017-06-19 09:25:54 +05:30
Sagar Vora
5f407907a2
fix logic of quantity validation ( #9311 )
2017-06-16 11:43:36 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
Nabin Hait
6e9a146f2b
Merge pull request #9193 from tundebabzy/issue_9180
...
Payment Entry - Latest Exchange Rate not fetched
2017-06-15 12:34:27 +05:30
Makarand Bauskar
428e5b7172
Merge pull request #9299 from rohitwaghchaure/refernce_name_issue
...
[fix] Payment Entry - draft sales invoices should not be selectable
2017-06-15 12:32:00 +05:30
Nabin Hait
2153399c39
Create journal_entry.py
2017-06-15 12:30:58 +05:30
Rohit Waghchaure
5ea8c97b7c
[fix] Payment Entry - draft sales invoices should not be selectable
2017-06-15 12:16:15 +05:30
Nabin Hait
6d7b0ce794
Warehouse Account Linking ( #9292 )
...
* [enhance] Added account in the warehouse
* documentation
* patch to move account head from account to warehouse
* fixed test cases
* Fixes in warehouse-account linking
* minor fix in test case
2017-06-15 11:09:27 +05:30
rohitwaghchaure
03ba66d0d8
[Fix] In sales invoice, delivery note link not showing in the dashboard if delivery note has made from sales invoice ( #9290 )
2017-06-14 19:41:11 +05:30
tunde
3514332cd8
changes journal_entry.get_exchange_rate to return exchange rate at date not average exchange rate
2017-06-14 13:14:40 +01:00
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
Nabin Hait
d0ac0bdc18
Merge branch 'master' into develop
2017-06-12 13:50:12 +05:30
Rohit Waghchaure
782d477be0
[fix] Due Date cannot be before Posting Date
2017-06-12 12:35:40 +05:30
Rohit Waghchaure
c8490626f9
[minor] added mobile no to search customer in POS
2017-06-10 12:21:37 +05:30
tunde
5127da952e
changes expected payment_account in test case according to the fact that exchange rate should return latest saved rate
2017-06-09 17:11:41 +01:00
tunde
0a5db528b1
makes sure latest test fixtures for currency exchange is retrieved before running test
2017-06-09 08:14:10 +01:00
tunde
9b827e5b95
makes set_exchange_rate retrieve the latest exchange rate not average for "pay" and "internal transfer" payment entries
2017-06-08 20:54:01 +01:00
tunde
6148fe0909
adds test case to confirm that latest exchange rate is automatically selected
2017-06-08 20:50:11 +01:00
tunde
3eb5cb14d1
calls erpnext.setup.utils.get_exchange_rate instead of get_average_exchange_rate
2017-06-08 14:23:49 +01:00
Nabin Hait
2c808c578d
Merge branch 'master' into develop
2017-06-08 10:34:45 +05:30
Makarand Bauskar
59a1540898
[minor] removed the deprecated inList method from eval ( #9177 )
2017-06-07 20:02:09 +05:30
tundebabzy
98f8da1294
hides payments field when is_pos is checked ( #9174 )
2017-06-07 20:01:51 +05:30
Nabin Hait
a128b21baa
Fixed merge conflict
2017-06-07 12:17:17 +05:30
rohitwaghchaure
d2be55b2e0
[Fix] Orders not creating from the POS for new customer if customer name is based on naming series ( #8933 )
...
* [Fix] Orders not creating from the POS for new customer if customer name is based on naming series
* [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile
* added customer name in the search bar of the customer
* search customer by phone number and email id in the POS
2017-06-07 12:04:01 +05:30
Prateeksha Singh
3a18dea8a4
[fix][multiselect] don't show completed PRECs for a PINV ( #9125 )
2017-06-07 11:55:25 +05:30
rohitwaghchaure
ce6e621c18
[fix] Not able to cancel the invoice if it's linked with the timesheet ( #9157 )
2017-06-07 11:52:04 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Ashwini Save
2020dd37e8
Fixed issue : Payment Entry allocating amount more than invoice amount. ( #9084 )
...
* Fixed issue : Payment Entry allocating amount more than invoice amount.
* Added condition to solve issue when allocated amount is null
* Code review Changes for payment entry
2017-06-01 19:00:34 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Nabin Hait
ac3b2aa913
Set change amount automatically only if it is a cash transaction ( #9065 )
2017-05-30 15:35:01 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Ashwini Save
d702cbfbfa
Update code to fix issue #erpnext WN-SUP25349 : ValueError: max() arg is an empty sequence. ( #9025 )
2017-05-25 15:48:08 +05:30
Nabin Hait
c795386230
Fixed merge conflict
2017-05-24 18:39:16 +05:30
Nabin Hait
258f7da778
Paid amount + Write Off Amount can not be greater than Grand Total in return POS
2017-05-24 17:12:07 +05:30
