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

4761 Commits

Author SHA1 Message Date
Marica
b8c5cd7331
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-12 20:16:58 +05:30
Marica
30cc040d50
Merge branch 'develop' into batch-selector 2021-01-12 20:14:35 +05:30
Anupam
c53ad88503 fix: resolved commit 2021-01-12 10:51:29 +05:30
Rushabh Mehta
7619d3d6d6 fix(merge): develop 2021-01-12 09:16:21 +05:30
Marica
aef71a8abe
Merge branch 'develop' into batch-selector 2021-01-11 14:22:11 +05:30
marination
7646d7b741 fix: Batch/Serial Selector for Batched Item 2021-01-11 12:51:15 +05:30
Marica
b9d5ae9285
Merge branch 'develop' into qi-ux 2021-01-08 20:28:28 +05:30
marination
b7637f49cd fix: Remove QI link on cancel wherever same QI name exists 2021-01-08 18:35:49 +05:30
marination
c4963bfdb2 fix: Back Update from QC based on Batch No 2021-01-08 09:56:04 +05:30
marination
ff6ee9d4e7 fix: Formula field description and Rearrange grid view 
- Missing closing quote in Formula field description
- In grid view of child table in QI, show only input fields
 2021-01-08 09:14:43 +05:30
Marica
d91c7e2b38
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-07 15:41:21 +05:30
Marica
eab1867235
Merge branch 'develop' into qi-ux 2021-01-05 14:23:05 +05:30
Saqib
60460a6d23
fix(e-invoicing): minor calculation fixes (#24282) 2021-01-05 13:54:04 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes (#24285) 2021-01-05 13:53:51 +05:30
marination
b8aeb9ea88 fix: Indentation and missing semi-colon 
- Fix incorrect indentation after merge conflict
- Sider
 2021-01-05 12:16:25 +05:30
Marica
41ea77ce31
Merge branch 'develop' into putaway 2021-01-05 11:24:05 +05:30
Marica
099162814c
Merge branch 'develop' into qi-ux 2021-01-05 09:27:40 +05:30
marination
0c883853b3 fix: Dont validate warehouse values between MR to Stock Entry 
- Remove validation thta checks if warehouse in Stock Entry is the same as MR that it was pulled from
 2021-01-04 18:48:50 +05:30
Anupam
27fd9e4d7d fix: added empty value in Quality Inspection Reading status 2021-01-04 18:18:00 +05:30
marination
7877d5a7c2 fix: Create QI Parameters (links) in test cases 2021-01-04 11:10:04 +05:30
Rohit Waghchaure
16bce49f18 fix: incorrect valuation rate for finished good 2020-12-31 17:39:52 +05:30
Deepesh Garg
23ab5c5cc0 fix: Multiplle sider issues 2020-12-31 11:29:06 +05:30
Deepesh Garg
133ce286f9 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-31 11:24:14 +05:30
rohitwaghchaure
b09ddc4672
Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue 
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
 2020-12-29 17:52:43 +05:30
Rohit Waghchaure
81285204dc fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions' 2020-12-29 16:25:45 +05:30
Deepesh Garg
4a8c2c4cb5 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-29 15:10:36 +05:30
marination
a69e81a151 chore: Made 'Parameter' a link field in QI and QI Template 
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
 2020-12-28 18:07:22 +05:30
marination
29a03bd5a1 feat: Add 'Manual Inspection' checkbox 
- fix merge conflict in js file
- Dont auto set status if manual inspection is checked
- Added 'Manual Inspection' checkbox in QI readings table
 2020-12-28 16:59:13 +05:30
Marica
62f9cc6c5a
Merge branch 'develop' into qi-ux 2020-12-28 15:09:15 +05:30
Rohit Waghchaure
40d2c6a0cc fix: finished good produced qty validation 2020-12-28 14:08:45 +05:30
Deepesh Garg
d3814b2676 Merge branch develop into batch-wise-pricing 2020-12-28 10:48:29 +05:30
Deepesh Garg
d4fc451c2a
Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset 
fix: accounting entries of asset when submitting purchase receipt
 2020-12-26 19:14:32 +05:30
Deepesh Garg
4f8da4c313 fix: Test Cases 2020-12-26 11:37:51 +05:30
Deepesh Garg
5269f02919 Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2020-12-25 18:35:26 +05:30
Deepesh Garg
bfc17e487c fix: Commonify code for Stock Entry 2020-12-25 18:34:39 +05:30
rohitwaghchaure
49d7499990
fix: added shipment link in delivery note dashboard (#24210) 
* fix: added shipment link in delivery note dashboard

* Update shipment.py
 2020-12-25 18:15:35 +05:30
Nabin Hait
b99c77b753
Reposting fixes (#24202) 
* fix: finished item validation and rate

* fix: Check if stock and account balance in sync after reposting

* fix: validate stock accounts in journal entry

* fix: validate expense against budget
 2020-12-25 18:12:35 +05:30
Nabin Hait
327f03566a
Reposting fixes pre release (#24203) 
* fix: finished item validation and rate

* fix: Check if stock and account balance in sync after reposting

* fix: validate stock accounts in journal entry

* fix: validate expense against budget
 2020-12-25 18:11:54 +05:30
rohitwaghchaure
de10d7dcf2
Update shipment.py 2020-12-25 15:15:55 +05:30
Rohit Waghchaure
5bcc6c6b15 fix: added shipment link in delivery note dashboard 2020-12-25 15:02:53 +05:30
rohitwaghchaure
630258f493
Merge pull request #24164 from rohitwaghchaure/do-not-manufacture-same-serial-no-two-develop 
fix: do not manufacture same serial no multiple times
 2020-12-24 17:46:26 +05:30
Rohit Waghchaure
ed20819432 fix: travis 2020-12-24 16:24:10 +05:30
Shivam Mishra
bba2726333 fix: minor styling fixes 2020-12-24 14:14:17 +05:30
prssanna
79c3d6f71d Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into shopping-cart 2020-12-24 11:36:59 +05:30
Rucha Mahabal
9fe7f235d0
fix: Do not cancel reference document on Quality Inspection cancellation (#24198) 2020-12-24 11:03:48 +05:30
Rucha Mahabal
d2f91e8c11
fix: Do not cancel reference document on Quality Inspection cancellation (#24197) 2020-12-24 11:03:36 +05:30
Rushabh Mehta
ab1c2b7631 fix(minor): routing 2020-12-23 23:26:58 +05:30
Nabin Hait
0411a43c6e fix: set finished good item rate based on qty 2020-12-23 12:14:41 +05:30
Saqib Ansari
09c6842199 fix: accounting entries of asset when submitting purchase receipt 2020-12-23 11:29:26 +05:30
Deepesh Garg
e5e2ad646a fix: Test Cases 2020-12-22 19:53:07 +05:30