pawan
438dfc081b
fix codacy issues
2017-11-06 17:39:30 +05:30
pawan
d59225635d
remove old report
2017-11-06 17:39:30 +05:30
pawan
b699b86b76
Add Total Row
2017-11-06 17:39:30 +05:30
pawan
8d1d64aa29
[fix] #11449
2017-11-06 17:39:30 +05:30
pawan
e61a275651
[fix] #11427
2017-11-06 17:39:30 +05:30
rohitwaghchaure
bcb7854340
Merge pull request #10982 from netchampfaris/multiple-users-pos-profile
...
[Enhancement] Allow Multiple users in POS Profile
2017-11-06 16:45:01 +05:30
Manas Solanki
76ce074c63
return the account details if and only if there is single account of that type ( #11407 )
2017-11-02 18:12:47 +05:30
Saurabh
3be72ef187
Merge branch 'master' into develop
2017-11-02 12:14:41 +05:30
Rohit Waghchaure
99748dbacf
[Fix] Wrong difference amount in the payment entry for the internal transfer type
2017-11-01 11:45:02 +05:30
Faris Ansari
3d59179205
Load default pos profile if not found
2017-10-31 21:56:16 +05:30
Manas Solanki
160e710ebf
set bank account only if there is single bank type account ( #11363 )
...
* set bank account only if there is single bank type account
* Update journal_entry.py
2017-10-31 13:04:02 +05:30
Prateeksha Singh
6b26e391b8
use the new frappe charts :D ( #11391 )
2017-10-31 12:58:48 +05:30
Faris Ansari
895aa7b7ac
fix codacy
2017-10-30 17:12:50 +05:30
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile
2017-10-30 15:00:55 +05:30
Faris Ansari
8c1099d236
Add POS Profile User DocType
2017-10-27 16:48:07 +05:30
Nabin Hait
edef9811f9
Merge branch 'master' into develop
2017-10-26 14:35:34 +05:30
Nabin Hait
52909b73bb
[test] Fixed advance jv cancellation ( #11333 )
2017-10-26 11:06:07 +05:30
Saurabh
0d597cef8d
Merge branch 'master' into develop
2017-10-26 09:59:22 +05:30
rohitwaghchaure
2e6f6d6749
[minor] cleanup code ( #11331 )
2017-10-25 17:03:49 +05:30
Nabin Hait
4d22b6db30
Fixed Merge Conflict
2017-10-25 14:09:46 +05:30
Nabin Hait
cd3dbcb2ef
Fixed Merge Conflict
2017-10-25 14:07:25 +05:30
tundebabzy
40a02769c5
Error in the Address fetched in Sales Order.( #11129 ) ( #11145 )
...
* add new function - `get_party_shipping_address`
* `swap `get_default_address` with `get_party_shipping_address`
* test cases
* properly sets order by direction
* move `get_party_shipping_address` to party.py
* fix test module import
2017-10-25 12:24:34 +05:30
Makarand Bauskar
e6712c129c
[hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings ( #11182 )
...
* [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings
* [minor] renamed the allow_stale_rate method to stale_rate_allowed
2017-10-25 12:17:40 +05:30
Nabin Hait
1c1237537b
Subscription fixes ( #11292 )
...
* Subscription fixes
* Removed recurring fields, cleanup code
2017-10-25 12:10:44 +05:30
rohitwaghchaure
2672c331af
Validation for duplicate offline pos ( #11281 )
2017-10-25 11:47:18 +05:30
Nabin Hait
8a0943ead7
Unlink reference doc on Journal Cancellation only if advance ( #11285 )
2017-10-25 11:46:35 +05:30
Charles-Henri Decultot
7862eb444f
[Hotfix] Addition of an empty tax group in the french CoA ( #11306 )
2017-10-25 11:44:46 +05:30
Nabin Hait
6c06e700d6
[Fix] Unallocated amount considering deductions ( #11314 )
2017-10-25 11:42:05 +05:30
Nabin Hait
7533101d4b
Merge branch 'master' into develop
2017-10-21 11:29:40 +05:30
rohitwaghchaure
5fdd26f1e7
[fix] Discount amount not reset for new order in offline pos ( #11258 )
2017-10-21 11:23:45 +05:30
Nabin Hait
bb60a59b96
Fixed asset test cases due to tax rule ( #11247 )
...
* Fixed asset testcases due to tax rule
* Delete tax rule record after running test cases
* Fixed test cases
* Fixed test cases
* Fixed subscription tests due to tax rule
2017-10-19 12:14:37 +05:30
Saurabh
5fa2adcca9
Merge branch 'master' into develop
2017-10-18 16:23:44 +05:30
Brown-Harry Boma
11e964d442
Set transaction type in pricing rule only if unavailable ( #11229 )
...
* Set transaction type in pricing rule only if unavailable
* Update pricing_rule.py
2017-10-18 11:07:09 +05:30
rohitwaghchaure
a516856c32
[Fix] Getting an error duplicate name while making an invoice in draft mode ( #11230 )
2017-10-18 11:05:10 +05:30
Javier Wong
84f7ba8699
[hotfix] Allow Sales User and Purchase User to Read Account Settings ( #11233 )
...
* [hotfix] Allow Sales User and Purchase User to Read Account Settings
This fixes https://discuss.erpnext.com/t/not-permitted-message-for-new-quotation-and-sales-order/29261/4 .
* Added back Accounts Manager Permissions
2017-10-18 11:04:15 +05:30
Prateeksha Singh
bfb108d722
Replace c3 ( #11112 )
...
* [charts] replace in asset.js
* replace in reports
2017-10-17 12:03:02 +05:30
Nabin Hait
45a640df08
Update payment_entry_reference.json
2017-10-16 12:58:32 +05:30
Nabin Hait
53659cf0bd
Update payment_entry_reference.json
2017-10-16 12:57:51 +05:30
Makarand Bauskar
80f333950b
[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' ( #11195 )
2017-10-16 11:27:22 +05:30
mbauskar
cd4202c2f7
Merge branch 'master' into develop
2017-10-15 19:10:56 +05:30
rohitwaghchaure
496174bbdf
[Fix] Naming series not copy from referebce document to new document in subscription ( #11196 )
2017-10-15 19:08:42 +05:30
Saurabh
5ffed60916
Merge branch 'master' into develop
2017-10-11 14:39:11 +05:30
Makarand Bauskar
4cdb9dee09
[minor] changed the modified date for the subscription doctype ( #11142 )
2017-10-10 18:41:00 +05:30
mbauskar
966b3c156a
[conflicts] resolved merge conflicts
2017-10-09 15:20:30 +05:30
Rohit Waghchaure
beeba8b37a
[Fix] Discount field not displaying in offline POS
2017-10-06 09:50:43 +05:30
Rohit Waghchaure
b870d0081b
[fix] Online print format in pos profile field not displaying
2017-10-06 09:31:40 +05:30
Utkarsh Goswami
4cb4d2f155
Tests for payment entry against purchase invoice ( #10930 )
2017-10-05 16:51:42 +05:30
mbauskar
74ce391303
Merge branch 'master' into develop
2017-10-05 13:36:50 +05:30
Nabin Hait
729aa2025a
Show commission section for pos as well ( #11059 )
2017-10-05 12:21:36 +05:30
rohitwaghchaure
e87a076f1d
Update link in the pos for offline and online mode from pos settings ( #11061 )
2017-10-05 12:20:20 +05:30
