Shreya Shah
3a9eec2e92
Calculate due date in Purchase Invoice on the basis of Supplier invoice date ( #12913 )
...
* pass bill_date as parameter and calculate due_date on that basis
* calculate payment_schedule on the basis of bill_date if present else posting_date
* add bill_date as an argument to get_party_details
* pass bill_date on supplier trigger in purchase invoice
2018-02-16 13:05:21 +05:30
Saurabh
2735701aab
resolved merge conflicts
2018-02-14 11:51:09 +05:30
rohitwaghchaure
8e675ebbe2
[Fix] Price list exchange rate is not visible when base currency and price list currency is different ( #12898 )
2018-02-13 17:11:06 +05:30
tundebabzy
6e90f49a35
Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 ( #12714 )
...
* unconditionally fetch exchange rate
* Revert "unconditionally fetch exchange rate"
This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a.
* allow for `plc_conversion_rate` field to be reset
* fetch exchange rate using price list currency and company currency not form currency
* clean up
2018-02-12 15:18:57 +05:30
Saurabh
ab8c7e616e
resolved merge conflicts
2018-02-08 15:17:15 +05:30
Faris Ansari
f7717b9ec2
get_party_account only if company is set
2018-02-08 11:11:21 +05:30
Saurabh
d581ff40ea
Merge branch 'master' into develop
2018-01-29 17:42:37 +05:30
rohitwaghchaure
52beb77539
Don't validate payment terms for POS ( #12692 )
2018-01-29 17:40:44 +05:30
Saurabh
03f6b3e588
resolved merge conflicts
2018-01-29 16:25:33 +05:30
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date ( #12685 )
...
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date
* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +05:30
Saurabh
fb2f97391f
resolved merge conflicts
2018-01-24 11:24:10 +05:30
Saurabh
3959aeb848
[fix] parse value before setting it to dissable_rounded_total on Purchase Invoice
2018-01-23 15:40:43 +05:30
Saurabh
ef31637549
Merge branch 'master' into develop
2018-01-22 15:29:15 +05:30
Shreya
39adc8f85f
calculate total when items are removed
2018-01-22 13:08:05 +05:30
Nabin Hait
570e29d5e7
Fixed merge conflict
2018-01-17 18:56:02 +05:30
rohitwaghchaure
da941af687
Set due date in purchase invoice based on suppler invoice date ( #12395 )
2018-01-17 16:23:04 +05:30
Nabin Hait
2bfa1803e9
GL Entry on asset sale ( #12514 )
...
* GL Entry on asset sale
* Asset sale test case fixed
2018-01-17 14:39:05 +05:30
Saurabh
4b0dd8a159
Merge branch 'master' into develop
2018-01-15 18:36:35 +05:30
Nabin Hait
a2426fcc9e
Get default tax template only if tax template not selected or template is for other company ( #12492 )
2018-01-15 17:45:46 +05:30
Saurabh
892a7a6980
resolved merge conflicts
2018-01-09 12:05:20 +05:30
tundebabzy
da22167741
Purchase Invoice - Due Date reverts to first time value on save #12340 ( #12382 )
...
* add handler for due_date:
if due_date is changed and payment terms template or payment schedule is set,
ask user to clear them.
* ui test cases
* cleanup
2018-01-09 10:58:44 +05:30
Nabin Hait
cb495fb33b
Merge branch 'master' into develop
2018-01-05 13:17:00 +05:30
tundebabzy
8f44d1c63d
Payment Terms in Delivery Note #12167 ( #12293 )
...
* add Payment Terms Template field to delivery note:
- This helps for users who create invoice from Sales Invoice
- Field is hidden in print
- Field is not coupled to Payment Schedule table.
* do nothing in payment_terms_template trigger if doctype is Delivery Note
2018-01-05 12:46:50 +05:30
rohitwaghchaure
1f39feb12f
[Fix] PO -> PI non default taxes not fetched ( #12313 )
2018-01-05 12:25:45 +05:30
Saurabh
14506d7878
Merge branch 'master' into develop
2018-01-02 12:09:25 +05:30
tundebabzy
650a1eeede
recalculate terms when document date changed ( #12288 )
...
* recalculate terms when document date changed
* clean up
2018-01-02 12:02:30 +05:30
Javier Wong
2469095a13
Check Meta before Toggling Conversion Factor ( #12237 )
...
If it has been customized so as to set the conversion factor to read only, `toggle_conversion_factor` should respect that setting.
2017-12-29 14:06:47 +05:30
tundebabzy
590bd0a8e5
trigger payment_terms_template only when needed ( #12124 )
2017-12-25 11:40:19 +05:30
rohitwaghchaure
1bc47fa43c
[fix] Sales order tax not fetching on the sales invoice ( #12055 )
2017-12-16 10:49:58 +05:30
Vishal Dhayagude
d377018695
[fix] Shipping charges change on qty, item_code and conversion_factor trigger ( #12001 )
...
* [wip] shipping rule
* [wip] Shipping Rule tax auto calculate
* [wip] Shipping Rule
* [new] Shipping charges change on different triggers
* [minor] Removed unnecessary comments
* [fix] Minor Changes in function calls
2017-12-14 18:06:02 +05:30
rohitwaghchaure
2b95a5438b
POS batch fixes ( #12005 )
2017-12-14 16:06:23 +05:30
rohitwaghchaure
efbc0667ec
[fix] On change of payment terms template, not fetch respective schedule data ( #11928 )
2017-12-11 14:54:20 +05:30
rohitwaghchaure
505661b5c0
[fix] Wrong company's default tax fetch ( #11927 )
2017-12-11 14:52:28 +05:30
Nabin Hait
d10014bdeb
minor fix in fetching payment terms template
2017-12-08 16:51:53 +05:30
Saurabh
34a0e90115
[fix] merge conflicts
2017-11-30 16:45:01 +05:30
Vishal Dhayagude
d42242df22
[Feature] Shipping Rule Calculation based on Net Weight ( #11770 )
...
* [new] Calculate shipping tax based on weight
* [fix] Change field name weight to weight_per_unit in SI Item
* [new] Shipping Rule based tax for selling module
* [new] Shipping rule based on weight added to Buying module
* [fix] Conflict in jsons
* [fix] Removed Redudant add_fetch
* [fix] Codacy fixed
* [fix] Print hide added
2017-11-29 16:09:59 +05:30
tundebabzy
bc7c387a0d
set read only property properly ( #11761 )
2017-11-28 22:40:05 +05:30
rohitwaghchaure
c037dc775e
Refactor multi pos profile selection in the pos invoice ( #11721 )
2017-11-28 16:11:15 +05:30
Nabin Hait
036bf6de6e
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-11-21 20:19:13 +05:30
Nabin Hait
32a62a02df
Fixed merge conflict
2017-11-21 20:18:03 +05:30
Nabin Hait
0551f7bb00
Cleanup and fixes of payment terms feature
2017-11-21 19:58:16 +05:30
rohitwaghchaure
e8ccc0e942
[enhance] Added multi UOM feature in Material Request ( #11352 )
...
* [enhance] Added multi UOM in Material Request
* test cases
* patch to update multi uom fields in material request item
2017-11-21 16:17:22 +05:30
KanchanChauhan
0fe455a991
[Minor][Bug] Fix syntax error ( #11633 )
2017-11-17 20:08:15 +05:30
Rushabh Mehta
30dc9a14c6
[feature] [refactor] Shipping Rule for Buying + Refactor ( #11628 )
...
* Shipping rule for Buying
* [refactor] shipping rule
2017-11-17 14:31:09 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Rushabh Mehta
98aa581864
[fix] default tax only on insert ( #11544 )
...
* [fix] default tax only on insert
* [fix] default tax only on insert
* [fix] default tax only on insert
2017-11-14 09:32:32 +05:30
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
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
tunde
19e63b73ed
Merge branch 'develop' into payment-terms
2017-10-03 12:02:38 +01:00
Nabin Hait
7b6eaee05b
Fixes to handle async events ( #11018 )
...
* Fixes to handle async events
* transaction.js code cleanup
* Don't map taxes and charges while making PO from SO for drop-ship
* Removed print
2017-10-03 01:09:46 +05:30
