CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-29 17:11:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
30,600 Commits 438 Branches 1,726 Tags
80c016a1ada3b4af9d1df47f491d4a3d679d91dc
Commit Graph

30600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shivam Mishra
80c016a1ad Merge pull request #22935 from scmmishra/fix-product-configurator 
fix: handle product_info null in item_configure
 2020-08-06 11:39:32 +00:00
Shivam Mishra
3619628e60 fix: handle product_info null 2020-08-06 17:08:14 +05:30
Shivam Mishra
abd111331e Merge pull request #22934 from scmmishra/fix-product-configurator 
fix: unbound error in product configurator 61b9727
 2020-08-06 11:22:39 +00:00
Shivam Mishra
61b9727fa2 fix: unbound error in product configurator 2020-08-06 16:47:43 +05:30
aakvatech
3adeab45ce Update transaction.js (#22788) 
Added frappe.flags.hide_serial_batch_dialog = true that was missing in version-12
 2020-07-23 12:14:36 +05:30
Sahil Khan
fd30b8f422 Merge branch 'v12-pre-release' into version-12 v12.10.1 2020-07-02 13:06:22 +05:30
Sahil Khan
30e33bef9e bumped to version 12.10.1 2020-07-02 13:26:22 +05:50
sahil28297
67e64dbc01 Merge pull request #22552 from frappe/mergify/bp/v12-pre-release/pr-22347 
Revert "fix: update remark on submitting payment entry" (bp #22347)
 2020-07-02 12:00:44 +05:30
Deepesh Garg
bae83679c0 Revert "fix: update remark on submitting payment entry" 
(cherry picked from commit 7d035fac36)
 2020-07-02 06:29:15 +00:00
rohitwaghchaure
d48e33dbd7 Merge pull request #22327 from frappe/mergify/bp/v12-pre-release/pr-22287 
fix: Quality procedure fixes (bp #22287)
 2020-06-19 11:01:41 +05:30
rohitwaghchaure
7af8ca1bd1 Merge pull request #22338 from frappe/mergify/bp/v12-pre-release/pr-22334 
fix: Customer Group label in Item-wise Sales History report (bp #22334)
 2020-06-19 11:00:31 +05:30
Kenneth Sequeira
4793e9c24c fix: Customer Group label in Itemwise Sales report 
(cherry picked from commit 766f978858)
 2020-06-19 05:29:07 +00:00
Sahil Khan
66a33bf7d9 Merge branch 'v12-pre-release' into version-12 v12.10.0 2020-06-18 20:06:18 +05:30
Sahil Khan
aa27a0e85c bumped to version 12.10.0 2020-06-18 20:26:18 +05:50
sahil28297
a9dbff0eae chore: correct version in release note 2020-06-18 20:03:00 +05:30
Marica
a9ed42f93d fix: Quality procedure fixes (#22287) 
* fix: Quality Procedure Fixes

- Dont prompt error message if parent is the same in child
- filter child procedure field
- Disable New button in tree view
- Editable grid for Quality Procedure Proces table.

* chore: Remove unnecessary get_doc

* fix: Codacy

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
(cherry picked from commit cce1116b4e)
 2020-06-18 13:48:34 +00:00
Deepesh Garg
fc488a2b46 fix: Do not copy Item Tax template from SO to PO (#22326) 2020-06-18 18:19:49 +05:30
Nabin Hait
f53ee9026b chore: Added Change log 2020-06-18 18:13:51 +05:30
mergify[bot]
5bd479e8ee refactor: handle exceptions when updating addresses (#22307) (#22316) 
* refactor: handle exceptions when updating addresses

* refactor: fold common statements in a loop

(cherry picked from commit 34d2bfbb3e)

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-06-18 17:04:45 +05:30
mergify[bot]
62882ea65b fix: asset maintenance fixes (#21277) (#22300) 
* fix: asset maintenance fixes

* fix: tests

(cherry picked from commit 9c494d3e72)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-06-18 15:30:04 +05:30
mergify[bot]
2417d9492f fix(HR): typo in error message in Employee Balance Report (#22306) (#22313) 
* fix: typo in date error message

* fix: error message cleanup in Leave Balance report

(cherry picked from commit af6a0f3a9d)

Co-authored-by: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
 2020-06-18 15:28:39 +05:30
rohitwaghchaure
130d254b5a Merge pull request #22310 from rohitwaghchaure/fixed-incorrect-variable-used-pre-release 
fix: incorrect variable used while adding items in the submitted sale…
 2020-06-18 14:18:22 +05:30
Rohit Waghchaure
82abcc94fa fix: incorrect variable used while adding items in the submitted sales order 2020-06-18 14:17:16 +05:30
Mangesh-Khairnar
6a0bd556d7 fix: update shopify api version (#22297) 2020-06-18 12:48:52 +05:30
Marica
c5c179490b Merge pull request #22293 from marination/variant-error-msg-pre-release 
fix: Typo in Item Variant Error Message
 2020-06-17 19:24:11 +05:30
marination
e256a7439e fix: Typo 2020-06-17 19:20:56 +05:30
Marica
b665da7cb4 Merge pull request #22282 from frappe/mergify/bp/v12-pre-release/pr-22281 
fix: Message Formatting for missing Expense Account (bp #22281)
 2020-06-17 13:55:25 +05:30
marination
7be4ba9351 fix: Message Formatting 
(cherry picked from commit 17ec1d6b28)
 2020-06-17 08:24:16 +00:00
rohitwaghchaure
d4c2c4e170 Merge pull request #22276 from frappe/mergify/bp/v12-pre-release/pr-22268 
fix: pos, serial no popup coming two times (bp #22268)
 2020-06-17 12:27:20 +05:30
rohitwaghchaure
23a2d789ec Merge pull request #22277 from frappe/mergify/bp/v12-pre-release/pr-22248 
fix: v12 travis (bp #22248)
 2020-06-17 12:27:07 +05:30
Rohit Waghchaure
5e68fdbaee fix: travis 
(cherry picked from commit e4834d2a37)
 2020-06-17 05:40:14 +00:00
rohitwaghchaure
9c55efa8c6 fix: pos, serial no popup comin two times (#22268) 
(cherry picked from commit 03f688acd9)
 2020-06-17 05:35:50 +00:00
rohitwaghchaure
256b6950f5 Merge pull request #22273 from frappe/mergify/bp/v12-pre-release/pr-22267 
refactor: hide company currency fields in the routing (bp #22267)
 2020-06-17 10:59:58 +05:30
rohitwaghchaure
956368e457 refactor: hide company currency fields in the routing (#22267) 
(cherry picked from commit fd3ff6be18)
 2020-06-17 04:13:12 +00:00
Sahil Khan
b6c6406206 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into v12-pre-release 2020-06-15 16:58:22 +05:30
rohitwaghchaure
253a698708 Merge pull request #22247 from marination/backflush-rm-rate-hotfix 
fix: Wrong key sent to get_valuation_rate
 2020-06-15 14:50:02 +05:30
marination
b819d8cdb6 fix: Wrong key sent to gte_valuation_rate 2020-06-15 14:47:37 +05:30
P-Froggy
84f44588d8 fix: Validation of Purchase Order against Material Request missing (#22224) 
Validation of Purchase Order and Purchase Order Item against the linked Material Request Item was missing.
This way, it was possible to exchange items while making a purchase order and still fulfill the material request, even though the items did not match.

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-15 13:40:54 +05:30
rohitwaghchaure
14961e55c8 Merge pull request #22196 from marination/add-to-cart-stock-hotfix 
fix: Handle unavailable Variants in Website
 2020-06-15 13:11:18 +05:30
rohitwaghchaure
db48fc2559 Merge pull request #22218 from marination/update-items-permission-fix-hotfix 
fix: submitted sales order can be updated with no permission
 2020-06-15 13:10:15 +05:30
marination
713cbcea44 fix: Travis 2020-06-15 12:09:04 +05:30
marination
0a31e2ea92 fix: Fetch cart setting from argument 2020-06-15 12:02:28 +05:30
rohitwaghchaure
087278baba Merge pull request #22209 from frappe/michellealva-expense-claim 
fix: add filter for cost center in expense table
 2020-06-15 10:36:31 +05:30
rohitwaghchaure
faff772619 Merge pull request #22220 from Anurag810/quality_procedure_fix_v12 
fix: Child is shown in Parent process if added from tree view
 2020-06-15 10:34:09 +05:30
Deepesh Garg
fa1af6d74e Merge pull request #22200 from marination/qi-on-return-hotfix 
fix: Don't prompt for Quality Inspection on Return Documents.
 2020-06-14 17:10:13 +05:30
rohitwaghchaure
01d2548235 Merge pull request #22238 from rohitwaghchaure/item-none-not-found-opening-creation-tool 
fix: item none not found while making sales invoice using opening inv…
 2020-06-14 15:09:08 +05:30
Rohit Waghchaure
5b11d18d86 fix: item none not found while making sales invoice using opening invoice creation tool 2020-06-14 14:06:12 +05:30
Deepesh Garg
d2ed36f167 Merge pull request #22229 from deepeshgarg007/financial_statement_to_date 
fix: Data not appearing properly for some fiscal_year in financial statements
 2020-06-13 19:19:55 +05:30
Deepesh Garg
1222fb074f fix: Data not appearing properly for some fiscal_year in financial statemets 2020-06-13 19:16:37 +05:30
Abhishek Balam
486be1049c fix(HR): Rename due_advance_amount field in Employee Advance for v12 (#22216) 
* added patch for moving data

* changed fieldname and references for easier debugging

* style: Added EOF

* reload doc for patch
 2020-06-13 01:18:29 +05:30