Nabin Hait
f87ec61043
Test case fixes for item defaults
2018-05-24 18:19:21 +05:30
Rohit Waghchaure
a91765707a
[Fix] TDS issue
2018-05-16 23:13:02 +05:30
Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Saurabh
f3f438ad18
tds fixed for PI
2018-05-14 20:42:08 +05:30
Saurabh
b9d3385fec
calculate TDS on Sales Invoice Amount
2018-05-14 20:42:08 +05:30
Zlash65
890707854d
config/utility level changes
2018-05-14 11:45:38 +05:30
Suraj Shetty
dcc90e3312
Add fix to support changes in user permission ( #13923 )
...
https://github.com/frappe/frappe/pull/5494
2018-05-04 17:52:57 +05:30
Nabin Hait
3707242770
Fixed merge conflict
2018-03-13 16:15:41 +05:30
Nabin Hait
89346967da
Reverted #13259 ( #13291 )
2018-03-13 16:01:11 +05:30
Nabin Hait
2f493731ec
Fixed merge conflict
2018-03-12 15:49:59 +05:30
Shreya Shah
69d9f51dbb
if price list not found, set default selling/ buying price list from settings ( #13259 )
2018-03-12 11:15:49 +05:30
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
Achilles Rasquinha
56b2e12af8
Python 3 fixes [merge asap] ( #12884 )
...
* Python 3 fixes
* fixed compare
2018-02-13 14:42:40 +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
Nabin Hait
0551f7bb00
Cleanup and fixes of payment terms feature
2017-11-21 19:58:16 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms
2017-11-17 12:41:56 +05:30
Umair Sayed
3a9ca883b9
Update party.py ( #11584 )
2017-11-15 13:44:04 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Nabin Hait
6605919ecd
GL Entries on sale of an asset ( #11538 )
2017-11-13 15:06:35 +05:30
Saurabh
0f86d86e27
[fix] validate party account ( #11517 )
2017-11-10 19:21:09 +05:30
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
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
tunde
19e63b73ed
Merge branch 'develop' into payment-terms
2017-10-03 12:02:38 +01:00
Nabin Hait
7eba1a35d3
Controller init args fix ( #11015 )
...
* Controller init args fix
* cleanup useless code
2017-10-02 15:59:27 +05:30
tunde
c49e748c85
Merge branch 'develop' into payment-terms
2017-09-29 13:30:22 +01:00
Rushabh Mehta
3c14c5a16c
[fix] tax_rule.py args
2017-09-29 13:21:22 +05:30
tunde
32aa7c1e68
Automatically set payment schedule if not specified
...
- fix failing test cases
- fix failing tests for recurring documents
- others
2017-09-07 06:52:15 +01:00
tunde
e5973e45f1
fix test
2017-09-05 18:11:58 +01:00
tunde
a496c43581
fix test
2017-09-05 17:36:21 +01:00
tunde
ed86efb1fd
modify get_due_date to check Supplier Type if needed
2017-09-05 01:15:31 +01:00
tunde
4163c9529d
fix get_due_date function to return date as string
2017-09-04 19:30:01 +01:00
tunde
8935f6546c
removes get_credit_days function as it is no longer useful
2017-08-31 16:31:15 +01:00
tunde
3b4bd3791d
adjust get_due_date to calculate based on payment term template
2017-08-31 16:28:47 +01:00
tunde
400d046653
set payment terms template in get_party_details
2017-08-31 13:44:57 +01:00
Nabin Hait
879e162cce
Additional GST related fields in Invoice and Sales/Purchase Register reort ( #10405 )
2017-08-21 08:28:55 +05:30
tunde
4a263c714d
get_party_detail should use default currency of party
2017-08-02 22:26:39 +01:00
rohitwaghchaure
e2176b852e
[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10160 )
2017-07-28 20:52:02 +05:30
Nabin Hait
8e0f23efc7
Multiple delivery dates in Sales Order and make DN based on selected delivery dates ( #9933 )
...
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates
* Test case and some other minor fixes
* Updated docs for multi delivery date
* removed the trailing whitespace
* removed the trailing whitespace
* removed trailing whitespace
2017-07-20 10:30:59 +05:30
_JG_
96bb6099d6
[fix] correctly choice 'Credit Limit' ( #9932 )
...
* [fix] correctly choice 'credit limit'
If 'Credit Days Based On' is empty in 'Supplier Type/Customer Group' then value 'Due Date' in 'Purchase/Sales Invoice' doesn't taken from the default settings
* Update party.py
* [fix] correctly choice 'Credit Limit'
2017-07-19 10:27:09 +05:30
Nabin Hait
7312186c76
Set corrected states list in GST State field's options
2017-07-13 10:41:15 +05:30
Nabin Hait
0a32b7a6eb
Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code
2017-07-12 19:21:05 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
Nabin Hait
4b12896941
Party Dashboard: Consider any random company if default company not set ( #9046 )
2017-05-26 21:25:36 +05:30
Nabin Hait
7e7dc0f254
Update party.py
2017-05-25 14:18:20 +05:30
Nabin Hait
24f0b13b22
Total unpaid amount in party is based on GLE
2017-05-24 16:46:56 +05:30
Nabin Hait
2d79a641c2
Annual billing amount in party dashboard based on grand total
2017-05-24 16:46:56 +05:30
Kanchan Chauhan
95108ac80b
[Minor] Party validation for Employee
2017-04-11 18:29:27 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Nabin Hait
9f4cb0c097
Fixed merge conflict
2017-02-20 15:00:04 +05:30
