Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,704 Commits 3 Branches 0 Tags 1 GiB
3c553b0938
Commit Graph

258 Commits

Author SHA1 Message Date
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
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
mbauskar
e7b87ad071 [minor] timestamp fixes for heatmap 2017-02-16 16:05:46 +05:30
rohitwaghchaure
ea092a7b24 [Enhancement] Booking of an employee's expense claim (#7267) 
* [Enhancement] Auto book of an employee's expense claim

* test cases

* documentation

* fixes and changes

* removed payable from employee and added into the company

* Added party in account, patch to update party type for customer and supplier accounts

* added party type in erpnext, fix patch

* fixed travis
 2017-02-01 12:02:08 +05:30
KanchanChauhan
fbaa6197f9 Employee Loan Management (#7126) 
* [WIP] Employee Loan Management

* EMI calculation

* Fixing PR
 2017-01-30 15:15:58 +05:30
robert schouten
c0888637cc [fix] accounts heatmaps now covering 366 days not 20 2017-01-18 15:25:58 +08:00
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
Nabin Hait
56548cbfa2 Payment against negative invoice, negative outstanding allocation and much more 2016-07-04 11:42:25 +05:30
Nabin Hait
16d6959d01 Payment Entry included in Bank Reconciliation and related reports 2016-07-04 11:42:24 +05:30
Rushabh Mehta
40b3a5bcc4 [optimize] communication query for heatmap 2016-05-20 12:54:59 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Rushabh Mehta
15a7f215b9 [enhancement] heatmaps on item and notifications for item 2016-04-14 17:30:53 +05:30
Anand Doshi
2f957f27b0 [fix] apply Tax Rule for lead 2016-04-08 17:43:08 +05:30
rohitwaghchaure
62fea0374b [Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party 2016-03-31 21:49:07 +05:30
Nabin Hait
d9449e396f [fix] Translations 2016-03-29 13:22:31 +05:30
Rushabh Mehta
9904c5acf4 Merge pull request #5050 from neilLasrado/develop 
Fixes Translations
 2016-03-29 10:51:44 +05:30
rohitwaghchaure
a1064a6149 [enhancement] request for quotation 2016-03-28 17:28:45 +05:30
Neil Trini Lasrado
b6d9946854 Fixes Translations 2016-03-28 12:44:05 +05:30
saurabh
8e49951821 fetch customer or supplier language and set on sales and purchase flow's form 2016-02-23 02:17:03 +05:30
shreyas
eba9ca4d66 [Minor]Change to maintain args ordering convention 2016-01-26 16:29:26 +05:30
shreyas
79872bf62c [Refactor]Changed variable name to avoid conflict between args and local variable 2016-01-26 13:57:06 +05:30
shreyas
c8ac3b042b [Minor]Refactored code for better readability 2016-01-26 13:23:38 +05:30
shreyas
f76853a8d9 [Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen 2016-01-25 21:25:11 +05:30
shreyas
323dc96c99 [Travis] Fixed reference failure in party.py 2016-01-25 18:19:14 +05:30
shreyas
29b565fdf5 Added Disabled field to Supplier and Customer doctype 
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
 2016-01-25 18:19:13 +05:30
shreyas
28a6578ba2 Added the credit_days_based_on field to Supplier and Supplier Type doctype 2016-01-25 12:44:14 +05:30
Rushabh Mehta
2d70887aaf [enhancement] bulk edit in bank reconciliation, #4356 2015-11-27 11:37:18 +05:30
Anand Doshi
0b93bdcf40 [fix] get_party_gle_currency caching 2015-10-22 19:33:08 +05:30
Anand Doshi
d8bc40d7f0 [fix] party gle currency validation 2015-10-22 17:55:22 +05:30
Nabin Hait
aa015902d5 Validate currency of default receivable/payable accounts 2015-10-19 15:10:11 +05:30
Nabin Hait
2873f2e7de Validate currency of default receivable/payable accounts 2015-10-19 15:10:11 +05:30
Anand Doshi
4b72d05793 [fix] get allocated_percentage from party's sales team 2015-10-12 16:15:52 +05:30
Anand Doshi
4945b94950 [fix] added validation to match account currency with existing gle and test case 2015-09-30 16:41:15 +05:30
Anand Doshi
248c867a2c [minor] removed test case for party multi-currency validation, since party multi-currency is now based on account 2015-09-30 15:11:13 +05:30
Anand Doshi
da98ab6f3c [fix] Only 1 account per company for a party 2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f [fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account 2015-09-30 15:11:12 +05:30
Anand Doshi
0ca587e018 [fix] if no party, don't validate due date based on credit days 2015-09-25 16:32:14 +05:30
Rushabh Mehta
307978fea9 [test-fixes] 2015-09-23 15:43:09 +05:30
Rushabh Mehta
72fbf902d7 [cleanup] added single price list for shopping cart, removed Applicable Territory 2015-09-23 12:50:34 +05:30
Rushabh Mehta
97c858a5e3 [fix] pull sales team from customer 2015-09-21 10:03:38 +05:30
Rushabh Mehta
361df8993f [fix] no default party currency 2015-09-18 12:59:51 +05:30
Saurabh
c663f5c2bd [Test] test state based taxasion 2015-09-15 15:41:01 +05:30
Saurabh
8f7317175d [enhancement] bring taxes from tax rules and test cases 2015-09-15 15:41:01 +05:30
Saurabh
957e7a37be [Shopping Cart][Fixes] tax calculation based on tax rule 2015-09-15 15:41:01 +05:30
Saurabh
def71d4d5d [Shopping Cart][Fixes] tax calculation based on tax rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
09f9c96c53 Fixes in Tax Rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
810bd35609 Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions 2015-09-15 15:41:00 +05:30
Nabin Hait
34fe81f7eb Patch fixed 2015-09-03 19:18:00 +05:30
Nabin Hait
1609933748 Test cases for multi currency 2015-09-03 16:03:07 +05:30
Nabin Hait
98096771c2 [multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that 2015-09-03 10:28:08 +05:30
Nabin Hait
c561a499d7 Multi currency GL entry fixes 2015-08-21 14:31:47 +05:30
Nabin Hait
6aea1c0da5 Currency validation in gl entry 2015-08-21 14:31:46 +05:30
Neil Trini Lasrado
fe2ffaeafa Fixes in Production Planning Tool 2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
09a66c4201 Fixed issue with Customer Contacts in Transaction Documents 2015-07-13 12:41:27 +05:30
Nabin Hait
93d3c82737 minor fix in due date validation 2015-07-10 17:12:08 +05:30
Nabin Hait
6336ff7323 minor fixes 2015-07-09 19:48:21 +05:30
Nabin Hait
4770a1abb5 Customer's credit days based on fixed days / last day of the next month 2015-07-09 16:35:53 +05:30
Nabin Hait
5ef121bc10 get party details only if party exists 2015-06-08 14:15:11 +05:30
Rushabh Mehta
5dbf8a7418 [cleanup] frappe.get_user 2015-05-01 11:51:26 +05:30
Rushabh Mehta
d7a5b7309b [minor] fix 2015-04-01 23:38:37 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Rushabh Mehta
364054a6fc [fix] payment tool #2791 2015-02-21 14:39:35 +05:30
Nabin Hait
db030d1761 Set Receivable/Payable account based on party 2014-10-06 13:13:27 +05:30
Nabin Hait
3a40435f8c Credit days and credit limit option in customer group / supplier type #1354 2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f Credit Limit and credit days fixes #2031 2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678 Deleted master_type, master_name, credit_days, credit_limit fields from account 
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
 2014-10-06 13:02:40 +05:30
Nabin Hait
9d610214cf Strip party name before checking for account 2014-09-16 12:28:40 +05:30
Nabin Hait
4d7c4fc0f4 Get party details fixes 2014-06-18 16:40:59 +05:30
Anand Doshi
a8ce570635 Permission relogication continued 2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7 Started permission relogication 2014-06-04 17:48:52 +05:30
Nabin Hait
6b03914731 asynchronus issue in get_party_details 2014-05-02 15:45:10 +05:30
Rushabh Mehta
8a40c136ce more message fixing 2014-04-15 16:31:20 +05:30
Rushabh Mehta
9f0d625300 update translation strings #1403 2014-04-14 19:20:45 +05:30
Anand Doshi
13ae548ff6 Fixes for model-cleanup frappe/frappe#478 2014-04-10 18:43:07 +05:30
Nabin Hait
365ae27acf frappe/frappe#478 fixes 2014-04-03 17:38:54 +05:30
Rushabh Mehta
f14b809ab5 frappe/frappe#478, more changes, removed bean 2014-04-03 14:30:42 +05:30
Rushabh Mehta
d36cb5c812 frappe/frappe#478 removed more instances of doclist 2014-04-03 12:38:42 +05:30
Rushabh Mehta
b385ecf65e frappe/frappe#478 2014-03-28 16:54:45 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields frappe/frappe#478 2014-03-28 13:55:00 +05:30