Saif Ur Rehman
3d275af67b
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
2019-01-24 23:40:16 +05:00
deepeshgarg007
c48efaba6e
fix(sales_invoice): fetch customer price list if available before pos profile price list
2019-01-24 17:15:38 +05:30
Frappe Bot
e415cce1a9
Merge branch 'staging' into develop
2019-01-23 08:19:00 +00:00
Nabin Hait
fb8c0bd664
Merge pull request #16464 from adityahase/flakes
...
style: Linting fixes
2019-01-23 12:08:57 +05:30
Aditya Hase
f79937d64b
style: Remove unused imports
2019-01-23 00:28:37 +05:30
Rohit Waghchaure
ddd9136d10
Renamed field and added finance book column in the trial balance simple report
2019-01-22 14:11:57 +05:30
Rohit Waghchaure
fa7ee0b3b6
Added dafult bank account in the customer/supplier
2019-01-17 15:45:27 +05:30
Rohit Waghchaure
affeb3dfec
Added on account amount field in Accounts Payable/Receivable Summary
2019-01-15 17:38:31 +05:30
Saif Ur Rehman
8d61794540
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
Saif Ur Rehman
13a6c0aeff
Fix tests
2019-01-06 18:14:18 +05:00
Saif Ur Rehman
7ea6554f1f
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/stock/doctype/item/item.json
2019-01-06 04:43:13 +05:00
deepeshgarg007
78ad6c4cb7
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix
2019-01-01 19:46:08 +05:30
Saif Ur Rehman
fd531a6b5e
feat: Tax Category based on Address
2018-12-29 01:49:11 +05:00
Saif Ur Rehman
677866824a
More work on Tax Category and Item Tax Template
2018-12-27 02:11:07 +05:00
Frappe Bot
9e09b3adbe
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
deepeshgarg007
a1d015cc2f
Initialized loyalty_point_details
2018-12-26 11:01:02 +05:30
deepeshgarg007
12f5cefc12
Loyalty program issue fix in customer dashboard
2018-12-25 16:06:19 +05:30
Suraj Shetty
7ed37ae6c3
Commonify code
...
- use get_permitted_documents function to avoid code redundancy
2018-12-19 19:56:42 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes
2018-12-18 15:41:03 +05:30
Suraj Shetty
07e5786e1b
Fix user permission checks
2018-12-10 19:10:18 +05:30
Frappe Bot
5b50b2848d
Merge branch 'staging' into develop
2018-12-10 13:08:33 +00:00
rohitwaghchaure
5472fff027
Added disabled field in the address ( #16114 )
2018-12-10 17:45:39 +05:30
Frappe Bot
7c2a5bddb1
Merge branch 'staging' into develop
2018-12-06 09:50:25 +00:00
deepeshgarg007
ee05e358d1
Rewrote query using orm
2018-11-29 16:24:28 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
deepeshgarg007
ebe1e12a82
Codacy issue fixes
2018-11-28 08:21:54 +05:30
deepeshgarg007
f31caffa74
Changes in get_dashboard_info
2018-11-27 15:04:12 +05:30
deepeshgarg007
6372fbba54
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
2018-11-27 14:06:58 +05:30
Rohit Waghchaure
d1a85a3637
[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice
2018-11-26 18:42:29 +05:30
deepeshgarg007
a1cffc3490
minor changes in dashboard
2018-11-23 16:51:35 +05:30
deepeshgarg007
920dc1400f
Customer/Supplier dashboard fix for multi company setup
2018-11-23 10:17:28 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop
2018-10-11 06:58:53 +00:00
Shreya Shah
2291323c65
fix(shipping-address-display): Fetch shipping address display as per the shipping address ( #15643 )
2018-10-11 10:13:27 +05:30
Ameya Shenoy
f174c95d80
Merge branch 'staging' into develop
2018-10-07 06:24:12 +00:00
Shreya Shah
5615cb4735
Set default only if customer_address not found ( #15605 )
...
* Set default only if customer_address not found
* Similar fix for Purchase Invoice and shipping_address
2018-10-07 11:42:07 +05:30
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
rohitwaghchaure
713cfc786f
[enhance] Payment order ( #15056 )
2018-09-11 17:40:37 +05:30
Nabin Hait
9a33bc6417
optimizing transactions by caching
2018-08-09 10:47:09 +05:30
Nabin Hait
50238c3049
[optimize] tree conditions for pricing rule
2018-08-08 18:43:04 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
Zarrar
7f8024c516
[Enhancement] Tax Withholding Category ( #15064 )
...
* add single, cumulative threshold, remove checkboxes
* remove tds child table from supplier & add tds link field
* add description field in tax withholding category
* add tax withholding data for indian setup, some fixes
* add a checkbox for tax withholding in purchase invoice
* remove supplier's child table for tds
* enable tds field if supplier has tds set inits master
* move rates data to child table - adding fiscal year support
* change bootstrap data according to child table config of tds
* show category name in list view
* loyalty program fixes
* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry
* add fiscal year dependency in company test
* minor loyalty program fix
* minor tier calculation fix
* minor handling duplicate exception
* toggle apply_tds according to supplier, code rectify
* minor fixes for loyalty program
* test case for single and cumulative threshold
* codacy fix
2018-08-01 17:45:05 +05:30
Nabin Hait
47ce481394
Minor fix
2018-07-19 11:10:46 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
rohitwaghchaure
3ffe89659a
[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice ( #14879 )
2018-07-13 17:40:48 +05:30
Shreya Shah
97124e92fa
[Fixes] Tax withholding category and Bank Guarantee ( #14576 )
...
* Fetch withheld percentage
* Set query for accounts on the basis of company
* Fix bank guarantee error on submit
* Remove errors caused by fields which are removed
2018-06-19 10:46:41 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop
2018-06-15 09:35:06 +00:00
Shreya Shah
0b9b8d6826
Remove unused code ( #14526 )
2018-06-14 17:57:39 +05:30
Zarrar
8cd0f67b25
query fix if name contains apostrophe ( #14370 )
2018-06-07 16:48:31 +05:30
Shreya Shah
4fa600a8dd
Apply GST based on Origin and Place of supply GST Code ( #14288 )
...
* Add new gst field in Taxes and Charges template - is_inter_state
* Add a patch
* Add a regional function to fetch taxes on the basis of GSTin
* Add regional function to hooks.py
* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN
* Fixes in the setup.py for India region
* Set is_inter_state field
For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.
* Fix as per review comment
2018-06-05 11:27:53 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Zarrar
58200182b4
update timeline data form Activity Log ( #14276 )
...
Documents updated are stored in Activity Log rather than Communication
2018-05-30 11:56:23 +05:30
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
