Commit Graph

3321 Commits

Author SHA1 Message Date
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
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
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
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
Rucha Mahabal
d2f91e8c11
fix: Do not cancel reference document on Quality Inspection cancellation (#24197) 2020-12-24 11:03:36 +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
Nabin Hait
a77b8c9fcc
Repost item valuation (#24031)
* feat: Reposting logic for future finished/transferred item

* feat: added fields to identify needs to recalculate rate while reposting

* refactor: Set rate for outgoing and finished items

* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item

* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item

* refactor: Get outgoing rate for purchase return

* refactor: Get incoming rate for sales return

* test: Added tests for reposting valuation of transferred/finished/returned items

* feat: added incoming rate field in DN, SI and Packed Item table

* feat: get incoming rate for returned item

* fix: no error while getting valuation rate in stock entry

* fix: update stock ledger for DN and SI

* feat: update item valuation rate in PR and PI based on supplied items cost

* feat: SLE reposting logic for sales return and subcontracted item with test cases

* feat: update qty in future sle

* feat: repost future sle and gle via Repost Item Valuation

* fix: Skip unwanted function calling while reposting

* fix: repost sle for specific item and warehouse

* test: Modified tests for backdated stock reco

* fix: ignore cancelled sle in few methods

* feat: role allowed to do backdated entry

* feat: Show reposting status on stock valuation related reports

* fix: minor fixes

* fix: fixed sider issues

* fix: serial no fix related to immutable ledger

* fix: Test cases fixes related to perpetual inventory

* fix: Test cases fixed

* fix: Fixed reposting on cancel and test cases

* feat: Restart reposting item valuation

* refactor: Code cleanup using small functions and test case fixes

* fix: minor fixes

* fix: Raise on error while reposting item valuation

* fix: minor fix

* fix: Tests fixed

* fix: skip some validation ig gle made from reposting

* fix: test fixes

* fix: debugging stock and account validation

* fix: debugging stock and account validation

* fix: debugging travis for stock and account sync validation

* fix: debugging travis

* fix: debugging travis

* fix: debugging travis
2020-12-21 14:45:50 +05:30
marination
eae31f02cc fix: Sider (missing semi-colons) 2020-12-21 13:58:44 +05:30
marination
68f91c9640 chore: Added tests for new ux
- Test for value based inspection
- tweaks in test for formula based inspection
- tweaks in create_quality_inspection as status in child row is auto set now
2020-12-21 12:24:45 +05:30
marination
0c4f97368d chore: UX improvement
- Removed 'single reading' checkbox, unnecessary
- Removed 'Mean' field and added computed mean to formula data
- Changed 'Value Based' to 'Non-Numeric'
- Re-arranged fields
2020-12-21 11:44:48 +05:30
marination
d6277cdc7f feat: Value Based and Numeric Quality Inspection
- Acceptance Formula is optional
- Choose between Value based and Numeric QI
- If numeric, select single or multiple readings
- Added Min, Max and Mean Values for numeric inspection to avoid formula usage
- Deprecated code cleanup in js file
2020-12-18 21:37:19 +05:30
Anurag Mishra
5e8e0037d6
Merge branch 'develop' into do-not-manufacture-same-serial-no-two-develop 2020-12-17 16:01:42 +05:30
Rohit Waghchaure
c9f63accdd fix: do not manufacture same serial no multiple times 2020-12-17 00:18:17 +05:30
rohitwaghchaure
8b8ef8d364
Merge pull request #24116 from rohitwaghchaure/fixed-stock-entry-multi-consumption-develop
fix: incorrect stock quantity if 'Allow Multiple Material Consumption…
2020-12-13 13:31:25 +05:30
Rohit Waghchaure
edb99d4e53 fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled 2020-12-12 16:03:07 +05:30
Rohit Waghchaure
5bfd6831c4 fix: delete Receive at Warehouse entry on cancellation of Send to Warehouse entry 2020-12-12 16:00:28 +05:30
Deepesh Garg
249595a2d8 fix: Sider Issues 2020-12-09 18:13:23 +05:30
Deepesh Garg
c41fb7556b fix: Add test case for batch pricing 2020-12-09 15:55:39 +05:30
Deepesh Garg
bc0a2859e4 fix: Rate for items with no batch 2020-12-09 12:40:09 +05:30
Deepesh Garg
91e1136d2c feat: Batch wise item pricing 2020-12-08 22:53:03 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return
feat: Return tracking in PR/DN
2020-12-06 22:43:34 +05:30
Michelle Alva
c9067e40cb
fix: Change validation message
grammatical fix
2020-12-06 10:48:32 +05:30
jbienesdev
8e68f128c1 fix: travis build error
- Removed shipment notification and subscription files
- Minor changes on shipment field configuration
- Add shipment to desk
2020-12-02 08:56:49 +00:00
jbienesdev
b4b542d1c3 chore: linter issues and sider checks 2020-12-02 07:15:16 +00:00
jbienesdev
99361b4a9e chore: remove notification details section 2020-12-02 07:15:14 +00:00
jbienesdev
28055f483d fix(shipment): change shipment test and refactor shipment.js 2020-12-02 07:15:13 +00:00
jbienesdev
ac3c1f1493 chore: remove packlink, letmeship, and sendcloud files 2020-12-02 07:15:11 +00:00
jbienesdev
000494f548 fix(shipment): apply code review 2020-12-02 07:15:05 +00:00
jbienesdev
1c9410e5e8 feat(shipment): Shipment Doctype with Integrations 2020-12-02 07:14:58 +00:00
marination
724e16bca1 chore: Use JSON style response and use ORM
- Use JSON style response for report columns
- Use ORM instead of frappe.db.sql
- Remove returned % from list view
2020-11-30 12:55:30 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return 2020-11-25 10:43:55 +05:30
Rucha Mahabal
6b57cf3285
feat: Quality Inspection on Job Card (#23964)
* feat: Quality Inspection on Job Card

* fix(Job Card): quality inspection filter query

* fix: sider issues
2020-11-25 09:17:16 +05:30
Anurag Mishra
927106f552 fix: maintain stock can't be changed it there is product bundle 2020-11-24 15:02:52 +05:30
Rucha Mahabal
9a73a67dcd
Merge pull request #23982 from pateljannat/track-changes-in-stock-settings
fix: enabling track changes for stock settings
2020-11-23 15:57:48 +05:30
pateljannat
34f381df17 fix: enabling track changes for stock settings 2020-11-23 15:31:08 +05:30
Jannat Patel
34d07b6306
fix: purchase receipt to purchase invoice bill date mapping (#23967)
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2020-11-20 19:22:35 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return 2020-11-19 12:21:38 +05:30
Rucha Mahabal
14514f776b
fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field (#23776)
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-19 08:17:16 +05:30
Marica
6dafe1eabf
feat: Formula based Quality Inspection (#23916)
* feat: Formula based Quality Inspection

* chore: Added Test for Formula Based QI reading
2020-11-19 08:12:58 +05:30
rohitwaghchaure
67ba0462e9
Merge pull request #23408 from kevingdc/fix/item-price-duplicate-checking
fix: Item price duplicate checking
2020-11-18 16:41:48 +05:30
rohitwaghchaure
1c8c1d78e9
fix: default cost center in item master not set in stock entry (#23877)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-11-15 09:40:44 +05:30
Jannat Patel
0ea0a7495c
fix: making company address read-only in delivery note (#23890) 2020-11-12 11:10:59 +05:30
Marica
2b44f22cf4
Merge branch 'develop' into fix-po-no-fetching 2020-11-11 11:10:34 +05:30