Commit Graph

30450 Commits

Author SHA1 Message Date
Deepesh Garg
724218418c
Merge pull request from frappe/michellealva-patch-1-1
fix: better error message due date
2020-04-09 17:38:48 +05:30
Michelle Alva
7f2477b72c
fix: better error message due date
show better error message payment schedule due date
2020-04-09 17:23:23 +05:30
rohitwaghchaure
cf17809c3f
Merge pull request from marination/mr-customer-provided-to-stock-entry
fix: Mapping Customer Provided Material Request to Stock Entry
2020-04-09 13:18:25 +05:30
Nabin Hait
bd063c3fef
Update CODEOWNERS 2020-04-09 12:49:15 +05:30
Nabin Hait
2f5431378e
core: Added codeowners 2020-04-09 12:48:30 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. () 2020-04-09 12:01:10 +05:30
gavin
74dd0e12e7
fix: enable validations for email and phone data fields () 2020-04-08 12:59:15 +05:30
Mangesh-Khairnar
49816b0c5f
fix(MWS): add new regions to marketplace ()
* fix(MWS): add marketplace region for uae

* fix: rename the fields for mws integrations

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 12:57:14 +05:30
Saqib
562fd0eab0
fix: purchase return are allowed even when assets are not cancelled ()
* fix: purchase return are allowed even when assets are not cancelled

* chore: test case

* fix: error message

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 12:11:40 +05:30
rohitwaghchaure
47c8ddb29b
Merge pull request from marination/pick-list-enhance
fix: Pick List Enhancements
2020-04-08 12:09:10 +05:30
Saqib
683581edef
fix: cannot find accounting module while rendering breadcrumb () 2020-04-08 11:49:06 +05:30
Nabin Hait
04870ae23a
fix: Replace newlines with spaces before evaluation of condition and formula () 2020-04-08 09:34:46 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces () 2020-04-08 09:32:41 +05:30
Raffael Meyer
28753268e6
fix(regional): DATEV report: description in header, quote nonnumeric values ()
* fix description in header, quote nonnumeric values

* fix: truncate 'Buchungstext' to 60 chars
2020-04-08 09:26:18 +05:30
Raffael Meyer
385a92d3f2
fix(patch): set_task_status ()
* fix(patch): set_task_status

* remove unnecessary loop, use tabs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 09:24:34 +05:30
Saqib
f93dc8dd88
fix: [ux] enforce 'get references from' in payment order () 2020-04-08 09:20:17 +05:30
Raffael Meyer
9aae0c27c2
feat(regional): a central place for regional address templates ()
* feat: a central place for regional address templates

* set up address templates during install

* why don't the tests run?

* fix: remove unused variables, fix cwd

* fix: .get() dicts contents

* fix: choose the right default

* fix: fieldname is template, not html

* fix: import unittest

* fix: remove unnecessary code

* fix: ensure country exists

* fix: ensure country exists

* feat: test updating an existing template

* fix(regional): DuplicateEntryError in test_update_address_template

* refactor and set 'is_default'

* fix codacy

* fix: patch gst_fixes

* fix: patch update_address_template_for_india

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 08:56:57 +05:30
rohitwaghchaure
36459c052f
Merge branch 'develop' into pick-list-enhance 2020-04-07 18:04:39 +05:30
rohitwaghchaure
0672b6b2e8
Merge pull request from rohitwaghchaure/get_serial_nos_based_on_posting_date_and_time_develop
fix: get serial nos based on posting date and time
2020-04-07 18:02:49 +05:30
Nabin Hait
c9f08bed2b fix: set batch qty in batch master and test cases 2020-04-07 17:33:10 +05:30
Rohan Bansal
f92a5f32bd fix: set batch ID as title instead of item code 2020-04-07 17:33:10 +05:30
Rohan Bansal
d2d73e6cb7 fix: prioritize empty over expired as batch status 2020-04-07 17:33:10 +05:30
Rohan Bansal
ba03853b2a fix: update Batch schema 2020-04-07 17:33:10 +05:30
Rohan Bansal
ced78cf116 fix(stock): make requested changes 2020-04-07 17:33:10 +05:30
Rohan Bansal
92669eae66 fix(stock): batch list view statuses 2020-04-07 17:33:10 +05:30
Rohan Bansal
4a50c99867 fix(stock): Update batch quantity whenever stock in it is moved 2020-04-07 17:33:10 +05:30
Rohan Bansal
1bd7ea99f4 fix(batch): Only consider valid stock ledger entries 2020-04-07 17:33:10 +05:30
Rohan Bansal
40611080da fix(patch): Fix edge cases for Batch 2020-04-07 17:33:10 +05:30
Rohan Bansal
56827a372c fix(patch): Reload Batch doctype before update query 2020-04-07 17:33:10 +05:30
Rohan Bansal
658ed14e40 feat(batch): Add total quantity and dashboard to Batch 2020-04-07 17:33:10 +05:30
Deepesh Garg
6c36cddbd3
Merge pull request from deepeshgarg007/dimension_filter_fix
fix: Use separate condition for tree and normal doctype
2020-04-07 15:23:36 +05:30
Deepesh Garg
62e9f83aab fix: Use separate condition for tree and normal doctype 2020-04-07 15:17:06 +05:30
rohitwaghchaure
d313a239de
Merge pull request from marination/bin-requested-qty
fix: Updated Bin Requested Qty logic
2020-04-07 14:50:19 +05:30
Rohit Waghchaure
560f822dbf fix: get serial nos based on posting date and time 2020-04-07 14:42:02 +05:30
rohitwaghchaure
55ea142afd
Merge pull request from marination/purchase-receipt-scan-barcode
feat: Scan Barcode in Purchase Receipt
2020-04-07 14:36:56 +05:30
Marica
c732e9967d
fix: Validate Serial/Batch No naming series in Item itself ()
* fix: Validate Serial/Batch No naming series in Item itself

* fix: Consider '#' too
2020-04-07 14:16:14 +05:30
Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance 2020-04-07 14:05:05 +05:30
marination
39f9dd03a7 fix: Use reload_doc in patch 2020-04-07 14:03:50 +05:30
Deepesh Garg
d14598bc51
Merge pull request from KanchanChauhan/address-from-lead
fix: (minor) Mandatory field missing to create address from lead
2020-04-07 12:22:54 +05:30
Vishal Dhayagude
24e79b14e1
fix(shopping cart): UX Improvements ()
* fix: nontype error for resolved and moved place order button at bottom left

* fix: removed inline style

* fix: Request for quotation move to lower right

* fix: move buttons

Co-authored-by: Naren <patilnarendra3@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:18:47 +05:30
Deepesh Garg
24a2c9b978
feat: Date range in financial statements ()
* feat: Date range in financial statements

* feat: Add date range filter in consolidated financial statement

* fix: Handle API changes in query_report

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:16:25 +05:30
Saqib
30fc621f1e
fix: Create Item tax template only for specific account types ()
fix: Create Item tax template only for specific account types
2020-04-07 12:12:04 +05:30
Saqib
5bd54f544c
fix(shopping-cart): address is made mandatory to place order ()
fix(shopping-cart): address is made mandatory to place order
2020-04-07 12:09:59 +05:30
Vishal Dhayagude
8ef0609fc7
fix: Make Sales Invoice paid when it create from shopping cart ()
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:07:01 +05:30
rohitwaghchaure
f8e8333d77
Merge pull request from rohitwaghchaure/material_request_incorrect_filter_issue_develop
fix: material request type manufacture shows items with Is Purchase I…
2020-04-07 12:06:18 +05:30
Deepesh Garg
4461868eff
Merge pull request from hrwX/update_modified
fix: update modified for opportunity
2020-04-07 10:15:41 +05:30
Deepesh Garg
f3c44a97f0
Merge pull request from nextchamp-saqib/payment-req-status-fix
fix: payment request status fixes
2020-04-07 10:13:08 +05:30
Himanshu Warekar
48307513c1 fix: update modified for opportunity 2020-04-07 09:06:03 +05:30
Kanchan Chauhan
4791e313db fix: Mandatory field missing to create address from lead 2020-04-06 23:56:23 +05:30
marination
e05013ede3 feat: Scan Barcode in Purchase Receipt 2020-04-06 22:13:13 +05:30