Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,322 Commits 3 Branches 0 Tags 1 GiB
2fa3cac814
Commit Graph

2446 Commits

Author SHA1 Message Date
marination
b7e94cc742 fix: Travis 2020-06-15 12:16:30 +05:30
Marica
7dd92f15fa
Merge branch 'develop' into update-items-permission-fix 2020-06-15 11:44:59 +05:30
Abhishek Balam
6c4a24a6c3 cleanup 2020-06-15 11:36:56 +05:30
Abhishek Balam
1a28227daa fix merge conflict 2020-06-15 10:58:51 +05:30
Rohan Bansal
ccd03bc120 feat: notify credit controller role users with credit limit extension requests 2020-06-12 12:48:54 +05:30
Abhishek Balam
996b306cda fix territory count 2020-06-12 11:38:07 +05:30
Abhishek Balam
72450d2af3 add revenue if within date range 2020-06-12 11:07:57 +05:30
Abhishek Balam
f596b5950e indent to tabs 2020-06-12 11:07:28 +05:30
Marica
aeeadee8f8
Merge branch 'develop' into update-items-permission-fix 2020-06-10 15:19:33 +05:30
Shivam Mishra
b84dd9b5f5 fix: dashboard chart does not exist on selling page 2020-06-03 13:24:18 +05:30
Deepesh Garg
fecac677ec
Merge pull request #22075 from abhishekbalam/fix-customer-count 
fix(Accounts): Customer Count in Customer Acq. Report wrong
 2020-06-02 00:09:01 +05:30
Abhishek Balam
192d4c8810 indent to tabs instead of spaces 2020-06-01 23:58:05 +05:30
Abhishek Balam
732f5c1867 fixed customer count logic 2020-06-01 23:51:39 +05:30
Saqib Ansari
a655db6a79 fix: unexpected removal of print hide field 2020-05-29 22:44:59 +05:30
Saqib Ansari
d531a8ab8d Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix 2020-05-29 22:37:13 +05:30
Saqib Ansari
2c3c8aaa2d fix: submitted sales order can be updated with no permission 2020-05-29 21:55:38 +05:30
Shivam Mishra
6621e22c02
refactor: clean up desk pages (#22004) 
* refactor: clean up desk pages

* refactor: update label for CRM
 2020-05-28 14:48:50 +05:30
Abhishek Balam
18e7b60acc
feat(Selling): Gross Profit In Quotation (#21795) 
* added valuation rate and gross_profit in quotation item table

* modified code to not fetch valuation_rate manually, used set_gross_profit from selling controller
 2020-05-26 18:37:02 +05:30
Deepesh Garg
3949b51026
Merge pull request #21785 from anupamvs/sales-order-tax-fix 
fix: tax id is not fetched when creating sales order from quotation
 2020-05-19 21:49:11 +05:30
Anupam K
75e8b1b519 tax id is not fetched in when creating sales order from quoation 2020-05-19 21:39:56 +05:30
rohitwaghchaure
aa85e511da
feat: Production Planning Against Sales Order/Material Request/Work Order (#21763) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-19 19:51:45 +05:30
Nabin Hait
b03072f83f fix: merge conflict 2020-05-19 11:35:08 +05:30
Nabin Hait
9aae6f4793 feat: accounting dashboard + desk 2020-05-18 18:03:11 +05:30
Marica
c734db5d45
fix: Validate Filters in Sales Funnel. (#21761) 
* fix: Validate Filters in Sales Funnel.

* fix: Style fixes
 2020-05-18 14:38:57 +05:30
Himanshu
d94a38eb51
fix: make queries show searchfields (#21685) 
* fix: make queries show searchfields

* Update erpnext/controllers/queries.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* Update queries.py

* Update erpnext/controllers/queries.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* Update erpnext/controllers/queries.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* fix: make fields string for sql

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-18 14:26:26 +05:30
rohitwaghchaure
10e24d9249
Merge pull request #21600 from anupamvs/lead-customer-issue 
fix: adding Email and Phone in Contact child table
 2020-05-15 04:43:38 +05:30
Deepesh Garg
12a9328a63
Merge pull request #21668 from abhishekbalam/develop 
feat(Selling): Territory Wise Treeview In 'Customer Acquisition and Loyalty' Report
 2020-05-13 14:26:40 +05:30
Abhishek Balam
411b125906 new parent updating logic, made requested changes 2020-05-12 15:25:35 +05:30
Abhishek Balam
87776c335b code improvements 2020-05-11 15:18:40 +05:30
Abhishek Balam
500dff63e7 fix: adjusted width of colums to see full column names, also fixes #21556 2020-05-10 14:53:59 +05:30
Abhishek Balam
5ec5584319 In treeview, bold only for root territory, looks cleaner 2020-05-10 00:24:43 +05:30
Abhishek Balam
7cbc902d90 removed validation for root node in territory, codacy recommended changed 2020-05-09 22:35:28 +05:30
Abhishek Balam
b59f2780eb fix: renamed view types, added default 2020-05-09 22:09:02 +05:30
Abhishek Balam
d543830a59 feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report 2020-05-09 21:56:53 +05:30
Anupam K
be6eb201b7 Appending Email and Phone in Child Table 2020-05-08 17:33:21 +05:30
Deepesh Garg
88e6f72cad
Merge branch 'develop' into sales-report-total-row 2020-05-06 10:48:21 +05:30
Anupam K
d097eaef63 Appending Email and Phone in Child Table 2020-05-05 15:57:49 +05:30
Saqib Ansari
52cc6ad456 fix: test 2020-05-04 20:24:00 +05:30
Deepesh Garg
6df581f78b
Merge pull request #21375 from marination/commonify-warehouse-autofill 
chore: Commonify auto-filling warehouses in child tables
 2020-05-03 20:33:45 +05:30
Saqib Ansari
ab9bb08c4b fix: test 2020-05-03 14:53:13 +05:30
Saqib Ansari
826b39559d fix: review fixes 2020-05-02 19:50:45 +05:30
Saqib Ansari
971170c590 fix: incorrect total in sales analytics for customer/item group 2020-05-02 19:39:03 +05:30
Saqib Ansari
dfa60e0ed8 chore: calculate total row month-wise in sales analytics 2020-04-30 20:06:30 +05:30
Saqib Ansari
10d9974e77 chore: add total row in sales analytics report 2020-04-30 16:28:52 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740) 
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-30 10:38:58 +05:30
Deepesh Garg
8113294d6e fix: Remove print 2020-04-29 22:16:47 +05:30
Deepesh Garg
0a6450115f fix: get_period_list API change fixes 2020-04-29 22:14:45 +05:30
Raffael Meyer
49bb8ccd2e feat: add Bank Account to dashboards 2020-04-28 18:56:47 +02:00
Marica
299e217668
fix: Blanket Order in SO/PO child tables (#21442) 2020-04-28 13:00:04 +05:30
Deepesh Garg
24b6055d89
Merge pull request #21427 from ruchamahabal/fix-desk-pages 
fix(Desk Page): Number of Open Leads not visible on Shortcut Card
 2020-04-27 08:41:14 +05:30
rohitwaghchaure
4d754eadc8
Merge branch 'develop' into quo-status-fix 2020-04-27 00:22:43 +05:30
Rucha Mahabal
e34ec70d44 fix(Desk Page): Number of Open Leads not visible on Shortcut Card 2020-04-26 23:40:37 +05:30
rohitwaghchaure
77403abadd
Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30
Saqib
8952ac1ab4
fix: custom buttons are hidden if order type of SO is customised (#21397) 2020-04-25 09:44:21 +05:30
Saqib
63084c6292
Merge branch 'develop' into quo-status-fix 2020-04-23 15:30:31 +05:30
Saqib Ansari
1e4c28e99d fix: quotation have expired status even if sales order exists 2020-04-23 15:28:47 +05:30
marination
8a30cb2565 chore: Commonify autofilling warehouses in child tables 2020-04-23 00:18:21 +05:30
Shivam Mishra
55baccd63a fix: specify column width 2020-04-22 11:50:06 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions (#21313) 2020-04-18 22:13:48 +05:30
Anupam K
790b9ee8d0 Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat 2020-04-18 01:51:47 +05:30
Anupam K
22318b2eb6 Linkedin, Twitter Integration 2020-04-18 01:46:38 +05:30
Deepesh Garg
3c6795a52d
Merge pull request #21305 from deepeshgarg007/partial_loan_repayment_fixes 
fix: Loan Repayment code clean up and other fixes
 2020-04-17 11:16:38 +05:30
Deepesh Garg
bf78ed6947 fix: Loan Repayment code clean up and other fixes 2020-04-16 22:53:47 +05:30
Saqib
14cdb24290
fix: serial and batch selection from delivery note bug fix (#21291) 2020-04-16 16:21:35 +05:30
Rohan Bansal
a1b747c3f3 fix: show stock UOM in POS 2020-04-14 14:28:56 +05:30
Marica
8636914e9a
fix: Lead Contact with blank first name via Customer (#21247) 2020-04-14 11:53:09 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance 2020-04-07 14:05:05 +05:30
Marica
f55c9c8d8c
Merge branch 'develop' into po_supplier_skip 2020-04-03 18:35:48 +05:30
Deepesh Garg
0f25a40421 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order 2020-04-02 21:30:53 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip 2020-04-02 21:17:52 +05:30
rohitwaghchaure
e4fecd725d
Merge pull request #21144 from anupamvs/year-sum-fix 
Sum of years not needed.
 2020-04-02 12:01:17 +05:30
Anupam K
b20dbff726 Sum of years not needed. 2020-04-02 11:37:44 +05:30
Anupam K
e48bcb30e7 Sum of years not needed. 2020-04-02 01:04:01 +05:30
Poranut Chollavorn
48aa2dd94b fix(pos): fix pos display item instock 2020-03-31 18:13:55 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom 
fix: UOM fixes in Sales Order,Material Request & Production Plan
 2020-03-31 16:24:37 +05:30
Deepesh Garg
242a079bcb Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order 2020-03-31 14:18:30 +05:30
prafful1234
3fa03df1e3
fix(transaction): Add comment-by from frappe session (#20867) 
Co-authored-by: prafful1234 <prafful@mntechnique.com>
 2020-03-31 10:40:42 +05:30
Deepesh Garg
c33412b6ae feat: Link blanket order and quotation 2020-03-30 22:44:13 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip 2020-03-30 13:07:03 +05:30
rohitwaghchaure
2d5addafa7
Merge pull request #21099 from anupamvs/item-wise-sales-history-billed-amount-bug 
bug: Item-wise Sales History - Billed amount
 2020-03-28 15:05:41 +05:30
Anupam K
85aae7de0b bug: Item-wise Sales History - Billed amount 2020-03-28 14:13:58 +05:30
Saqib
74864b3b61
fix: currency not fetched on quotation creation (#20996) 2020-03-26 13:20:31 +05:30
Saqib
faea85451f
feat: auto set batch no on serial no selection (#20757) 
* feat: auto set batch no on serial no selection

* fix: dialog not shown if set warehouse selected

* fix: typo

* fix: merge conflict

* fix: callback no getting called after serial no selected

* fix: available batch qty not fetched without set_warehouse selected

* fix: item batch not synced with dialog batch table
 2020-03-26 13:18:57 +05:30
marination
73c8d23a79 fix: UOM fixes in Sales Order,Material Request & Production Plan 2020-03-20 17:52:28 +05:30
Marica
508ed1e121
fix: Missing if condition in Customer Default Bank Account Validation. (#20969) 2020-03-18 11:28:04 +05:30
marination
e1f499ae1b fix: Pick List Enhancements 2020-03-17 11:47:11 +05:30
Deepesh Garg
eeb1922e37 fix: Add check to skip SO and DN in customer master 2020-03-17 11:43:34 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord (#20886) 
* s_inv has is_pos default set as 1
 2020-03-16 17:51:00 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Saqib
b978d79573
fix: show uom in print formats instead of stock uom (#20843) 
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
 2020-03-06 11:03:46 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Deepesh Garg
6d604a151b
fix: Validation message 2020-03-04 11:55:10 +05:30
Lokesh Waingankar
d398c73bc5 fix: Removed html tags in pop up message (#20603) 2020-03-03 19:07:51 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Lokesh Waingankar
38242bc21f Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-03-02 17:45:59 +05:30
Shivam Mishra
3f59af3ef1 feat: added base config for domains 2020-03-02 17:25:18 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup (#20772) 
* chore: Item Price and Product Bundle Form cleanup

* fix: Trailing comma
 2020-03-02 15:51:14 +05:30
Lokesh Waingankar
efb6482ef6 fix: user is not able to do 'Set as Lost' for Quotation (#20689) 2020-02-27 19:08:58 +05:30
Rucha Mahabal
6071313965
fix: document creation via onboarding slide (#20644) 
* fix: defaults not set in doc created via Onboarding Slide

* fix: default company not set in Supplier
 2020-02-20 12:57:21 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083) 
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-18 12:28:41 +05:30
Deepesh Garg
cf8e2732c9
Merge pull request #20428 from 0Pranav/territory-sales-pipeline 
feat: add territory wise sales report
 2020-02-06 13:11:07 +05:30
Deepesh Garg
da406d74ef
fix: Remove debug param 2020-02-06 12:55:21 +05:30
Deepesh Garg
a4928f6f5b fix: Add report link in module view and fix date filter 2020-02-06 12:50:25 +05:30
0Pranav
9d9a3d85d8 fix: filters after rename 2020-02-05 14:17:21 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer (#20465) 
* fix: Label and UX fixes while creating payment entry against customer

* fix: filter
 2020-02-03 15:58:50 +05:30
0Pranav
9c4399e1f2 fix: better syntax for checking empty arrays 2020-02-03 14:57:42 +05:30
0Pranav
b1473c3de0 fix: return empty array 2020-01-31 10:43:00 +05:30
0Pranav
75adb808e5 various fixes from review 
- Rename the report to title case
- Added company filter
- fixed checks in filter and += operator for total
 2020-01-31 10:35:47 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Himanshu Warekar
e169d2964c fix: change fieldtype to Text 2020-01-24 17:40:29 +05:30
KanchanChauhan
a7d1985b5f fix: Set Quotation expired if not Ordered or Lost (#20354) 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-01-21 12:35:11 +05:30
Himanshu
e3afe8a73c fix: don't hide primary_address_and_contact_detail (#20322) 2020-01-16 13:39:29 +05:30
0Pranav
6280609c25 enhancement: add territory wise sales report 2020-01-14 15:53:35 +05:30
Rohit Waghchaure
ecdfc1a15c fix: allow on submit for the delivery date field 2020-01-13 12:43:26 +05:30
Pranav Nachnekar
1612432f45 fix: parent item should not appear in raw material request dialog (#20216) 2020-01-09 13:32:15 +05:30
Pranav Nachnekar
971458043d fix: add new delivery note button in Sales Order (#20199) 
* fix: add new delivery note button in Sales Order

* fix: removed debugger

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-01-07 11:29:35 +05:30
Deepesh Garg
ef0d26c161 feat: Validity for Item taxes (#20135) 
* feat: Validity for Item taxes

* fix: Trigger for gst hsn code

* fix: Sort taxes based on validity

* fix: Validation for item tax template and filters based on validity

* fix: Add missing semicolon

* fix: Validate tax template only if item code available

* fix: Do not validate or filter item tax template if no item taxes applied

* fix: Consider item group for validating taxes

* fix: Test cases for item tax  validation

* fix: Item tax template filtering fixes

* fix: Add missing semicolon

* fix: Remove unnecessary query
 2020-01-06 15:34:15 +05:30
Rucha Mahabal
2d293c585e fix(Subscription): pass start_date while computing next_schedu… (#20159) 2019-12-31 19:15:37 +05:30
Javier Wong
5cc7648e9c [Fix] Allow Print Before Pay in POS (#20151) 
Print Button does not show even when Print Before Pay is enabled in the POS Profile.
 2019-12-31 17:07:37 +05:30
Saqib
71649fe141 fix: customer credit limit label (#20152) 2019-12-31 17:05:34 +05:30
Marica
5483f1a27e fix: Field 'other_charges_calculation' column type changed. (#20141) 2019-12-30 22:20:02 +05:30
thefalconx33
2073eeb8fa fix: don't allow deletion of items which has work order assigned to it 2019-12-27 16:26:03 +05:30
deepeshgarg007
bd1da65098 fix: Update modified date 2019-12-26 18:26:13 +05:30
deepeshgarg007
0b9a98ad43 fix: Add against blanket order field in sales order 2019-12-26 18:15:13 +05:30
Saqib
7519436260
Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos 
feat: provision to select the custom fields in the online POS
 2019-12-26 13:40:43 +05:30
Rohit Waghchaure
682273a00b feat: provision to select the custom fields in the online POS 2019-12-26 11:59:19 +05:30
Saqib
0ad7449ae3 feat: allow adding & deleting of items in submitted SO & PO (#19911) 
* feat: allow adding of items after quotation submission

* feat: allow deletion of items from submitted SO & PO

* fix: case when items are added and deleted at once

* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
 2019-12-24 16:42:30 +05:30
Don-Leopardo
5557b16260 fix: order_type validation restriction (#18096) 2019-12-24 16:39:34 +05:30
Deepesh Garg
a02bb5170b
Merge pull request #19913 from nextchamp-saqib/cart-address-fix 
fix: enable adding of address without enabling checkout feature
 2019-12-24 14:08:19 +05:30
Rucha Mahabal
0e83a5754b fix: remove illustrations from onboarding slides (#19872) 
* fix: remove illustrations from onboarding slides

* fix: change Welcome slide's description

* fix: justify text in slide
 2019-12-23 08:24:46 +05:30
Deepesh Garg
57f9b758b7
Merge pull request #19983 from 0Pranav/mapped-doc-for-customer-quotation 
fix: use open_mapped_doc instead of create_new_doc
 2019-12-19 11:59:50 +05:30
deepeshgarg007
aba58ba50e fix: Spacing after commas 2019-12-19 11:02:37 +05:30
0Pranav
0db86204cf fix : only set price list if it exists for customer 2019-12-18 16:03:40 +05:30
0Pranav
5150c69ee6 use open_mapped_doc instead of create_new_doc 2019-12-18 12:16:49 +05:30
thefalconx33
e9c9cbd2fe fix: display serial no selection on adding items to cart 2019-12-16 14:55:16 +05:30
thefalconx33
107989316c fix: additional notes from Quotations not saved in SO 2019-12-11 18:15:54 +05:30
rohitwaghchaure
c58495dcee fix: Item-wise Sales History report not working (#19889) 2019-12-10 21:34:03 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469) 
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
 2019-12-10 15:55:05 +05:30
Saqib
7e958da6d6 fix: sales order reqd only checks for stock items (#19865) 2019-12-09 17:23:19 +05:30
Deepesh Garg
babc2d1ea4 fix: Consistency in button positions in Sales Order and Purchase Order (#19833) 2019-12-09 13:04:44 +05:30
Rucha Mahabal
690068142b feat: Continue Slide and New Illustrations for Onboarding Wizard (#19813) 
* feat: added illustrations for onboarding

* refactor: change help label for supplier

* refactor (breaking): rename Setup Wizard slide to Onboarding Slide

* chore: code cleanup for the old doctype Setup Wizard Slide

* fix: added a 'Continue' type slide

* fix: change text in continue slide

* fix: change text for continue slide
 2019-12-06 20:58:26 +05:30
ronelvcabrera
370cdc0170 feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612) 2019-12-04 16:07:11 +05:30
Saqib
d635bda29b fix selling setting label for sales order reqd (#19775) 2019-12-03 17:05:06 +05:30
Deepesh Garg
b4b90eaaf7
Merge pull request #19762 from Mangesh-Khairnar/fix-pr-creation 
fix(sales-order): allow payment request creation for so that are not billed
 2019-12-03 10:42:01 +05:30
deepeshgarg007
f89b172202 fix: Available stock for packing item report 2019-12-01 21:53:32 +05:30
Mangesh-Khairnar
92b9d7383d fix: show create payment request for so that are not billed 2019-11-29 14:22:52 +05:30
Marica
bcd02069ea fix: Validation for Suppliers in SO to PO (#19686) 
- Check if there is a Supplier against atleast one item in Sales Order
- Validation message earlier was vague
 2019-11-28 18:23:45 +05:30
Shivam Mishra
30245a0673
Merge pull request #19677 from ruchamahabal/setup_wizard 
feat: Slides for Onboading Wizard in ERPNext
 2019-11-28 14:35:10 +05:30
Marica
f0e87f7fdd fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19693) 2019-11-27 15:49:41 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard 2019-11-27 11:55:53 +05:30
Rucha Mahabal
e2bb82872c fix: moved slide json files to respective modules 2019-11-26 18:46:17 +05:30
Rucha Mahabal
3f8c460584 feat: moved slide action functions from onboarding utils to doctypes 2019-11-26 15:22:45 +05:30
Deepesh Garg
5558ee8597
Merge pull request #19591 from 0Pranav/FR-ISS-152101 
fix: add status "expired" to doctype quotation
 2019-11-26 09:08:30 +05:30
deepeshgarg007
53a66ee386 fix: Method name in hooks, test case code clean up 2019-11-25 21:58:15 +05:30
0Pranav
565d3efcdf fetch updated document in test_quotation 2019-11-25 17:11:12 +05:30
0Pranav
cf3a2f6579 set transaction date to yesterday 2019-11-25 16:26:04 +05:30
0Pranav
032baeac5b don't submit quotation 2019-11-25 15:15:00 +05:30
0Pranav
754c43f6c3 fix set_expired_status method 2019-11-25 14:27:43 +05:30
0Pranav
e0c9f3c282 fix valid date 2019-11-25 14:14:51 +05:30
0Pranav
a9ff7df2e6 add sql query to set valid_till 2019-11-25 12:55:27 +05:30
Pranav Nachnekar
04e3a506e4 fix: Primary address not being fetched for customer (#19667) 
* fix: priamry address not being fetched

* add doctype to filter for customer_primary_address

* remove get_customer_primary_address_method
 2019-11-25 12:04:00 +05:30
0Pranav
a077795581 fix tests 2019-11-25 12:01:00 +05:30
0Pranav
eefc492ff4 call commit after sql query for schedular job 2019-11-25 10:51:27 +05:30
0Pranav
6c368e2dfb submit quotation in test 2019-11-22 13:22:12 +05:30
0Pranav
b3354198f1 Fix sql query in set_expired_status 2019-11-22 12:38:43 +05:30
0Pranav
f5112905dc import make_item method in tests 2019-11-21 13:19:44 +05:30
0Pranav
4a28144941 add tests 2019-11-20 15:53:19 +05:30
0Pranav
5717a265b7 remove: unused imports 2019-11-20 15:31:13 +05:30
rohitwaghchaure
238521c2bd
Merge pull request #19501 from Mangesh-Khairnar/multiple-pos-profile 
feat: multiple company pos profile
 2019-11-19 18:39:06 +05:30
Mangesh-Khairnar
c436d93303 fix: reset pos profile when default doesn't exists 2019-11-19 18:21:53 +05:30
Pranav Nachnekar
e13b769813
use nowdate instead of date.today() 
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2019-11-19 12:04:30 +00:00
0Pranav
b9460ed22c switched ORM methods for single SQL query 2019-11-19 10:46:07 +05:30
Mangesh-Khairnar
f69b9a8c47 fix: fetch default pos profile user for the company 2019-11-15 16:54:26 +05:30
0Pranav
53b65ab8ed Add status expired to doctype quotation 2019-11-15 16:42:32 +05:30
rohitwaghchaure
6424416886 fix: sales order item shwoing incorrect produced qty (#19584) 2019-11-15 14:18:45 +05:30
0Pranav
f75ea952e3 Added expired status to quotation 2019-11-13 11:03:53 +05:30
Mangesh-Khairnar
2f44480d69 enhancement: Item-wise sales history report (#19500) 
* refactor(item-wise-sales-history): convert query report to script report

* refactor: add columns, fetch data

* refactor: shift company set func to utils

* fix: add filters

* fix: minor changes

* fix: fetch all the descendants
 2019-11-11 10:54:12 +05:30
Diksha
7091a2102c fix(sales order): rename delivery to delivery note on sales order make button 2019-11-04 12:03:35 +05:30
Mangesh-Khairnar
e3bc213262 feat: multiple company pos profile 2019-11-01 22:35:08 +05:30
Rohan
8728e94dbd
Merge branch 'develop' into develop-company-address-label 2019-10-29 11:26:00 +05:30
Suraj Shetty
83b58352ce fix: Overwrite default cost center if item has default cost center set. (#19405) 2019-10-28 12:05:30 +05:30
Rohan
962f4eb96c
Merge branch 'develop' into develop-company-address-label 2019-10-23 15:57:26 +05:30
Nabin Hait
bd6b1806cd fix: fixed asset register report and made skip-dn field hidden 2019-10-22 14:28:37 +05:30
Deepesh Garg
6208755d54 fix: Unable to add details in quotation and opportunity (#19354) 2019-10-21 13:29:44 +05:30
deepeshgarg007
737ec6b26e fix: Travis 2019-10-20 17:36:36 +05:30
Rohan Bansal
83740de636 fix(selling): Add missing label to company address field 2019-10-16 15:16:00 +05:30
Rohit Waghchaure
66072fec5a fixed conflicts 2019-10-15 14:18:59 +05:30
ashish-greycube
74dc3c99de feat: coupon_code and referral_sales_partner functionality 2019-10-15 11:44:45 +05:30
deepeshgarg007
683a89a415 fix: Chart fix in Analytics report 2019-10-12 23:02:53 +05:30
Mangesh-Khairnar
4ed9b45fb8 feat(Sales Order): Allow to skip delivery note creation (#19222) 
* feat(sales-order): add option to skip delivery note creation for order type maintenance

* fix(sales-order): hide delivery date on setting skip delivery note creation

* fix: allow skipping delivery note for all order types

* fix: bypass delivery note creation on setting skip delivery note creation

* fix: show skip delivery note in list view

* fix: check for duplicate project name after submitting prompt

* fix:  toggle delivery note reqd for skip delivery note

* fix: update status based on skip delivery note
 2019-10-12 19:33:11 +05:30
Himanshu
eba3a8e802 fix: get contact details (#19281) 2019-10-11 10:43:24 +05:30
Saqib
d5067b4d73 chore: label changes in retail and stock (#19243) 2019-10-04 16:24:26 +05:30
Rucha Mahabal
34326470b8 fix: produced_qty field hidden and not updated in sales order item (#19037) 
* fix: produced_qty field hidden and not updated in sales order item

* fix: added patch for old sales orders

* fix: produced_qty for sales order item linked to multiple work orders

* fix: comment

* fix: function for updating produced_qty in SO Item

* fix: remove frappe.db.commit
 2019-09-30 12:15:39 +05:30
Himanshu
25ab1e41df fix(Contact): mobile_no re-introduced and travis fixes (#19009) 
* fix: mobile_no re-introduced

* fix: test cases

* fix: set email as primary

* fix: add primary email and phone

* fix: utils for contact creation

* chore: remove = from dict
 2019-09-30 10:08:15 +05:30
Saqib
451d1a1744 fix: Bypass credit limit and Project Template field not visible(#19162) 
* Fix: Allow Project Template in Quick Entry

* Fix: Label Changes
 2019-09-24 19:10:59 +05:30
Deepesh Garg
d9e9d562f8 fix: Travis (develop) (#19140) 
* fix: Travis

* fix: Syntax Error
 2019-09-24 11:44:52 +05:30