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

1347 Commits

Author SHA1 Message Date
marination
c0c455c471 fix: Procurement Tracker Data Consistency 2020-05-31 20:20:59 +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
marination
50956aa29e chore: Added to v13 desk under Regional Link Card 2020-05-27 22:24:39 +05:30
Marica
c2aabb0fbf
fix: Buying Module fixes (#21965) 
* fix: Buying Module fixes

* fix: Delete Report files as well

* fix: Add Purchase Order Analysis to Stock & Accounting
 2020-05-27 20:56:39 +05:30
Marica
a49f045d14
fix: Grammar fixes (#21970) 2020-05-27 20:28:37 +05:30
Marica
07f305a1d6
refactor: open link in new tab (#21910) 2020-05-25 16:30:59 +05:30
Nabin Hait
e005078c0d feat: buying module dashboard and onboarding 2020-05-19 20:22:25 +05:30
marination
50d4bf578b fix: Date filters added to dashboards, number cards and minor fixes. 2020-05-19 17:02:47 +05:30
marination
75c65fd1b1 fix: Handle empty chart state and change desk dashboard 2020-05-15 23:47:51 +05:30
marination
a74d433cd8 fix: Fixed Dashboard Charts, modified fixtures and minor changes 2020-05-15 23:37:48 +05:30
marination
e46916be56 Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard 2020-05-15 21:17:25 +05:30
marination
ec1f9594fa fix: Refined Onboarding, desk cards and renamed field in Buying Settings 2020-05-15 15:17:11 +05:30
marination
e4fc5ba83c fix: Report conditional query simplification. 2020-05-12 18:58:54 +05:30
marination
7adca986fb chore: Onboarding v2 2020-05-12 18:40:35 +05:30
marination
354b01617e chore: Dashboard Fixtures 2020-05-12 17:35:17 +05:30
marination
d99f85bf3c chore: Fixtures using new sync api 2020-05-12 13:16:05 +05:30
Marica
c1a890a739
Merge branch 'develop' into quoted-item-report 2020-05-07 17:45:32 +05:30
marination
31a747b98a fix: Query enhancement, cleanup, added extra filter 
- Query changes as requested
- Moved chart generation from js to py
- Added Supplier Multiselect filter
 2020-05-07 17:38:00 +05:30
marination
631260b632 chore: Added fixtures and Onboarding. 2020-05-06 18:12:26 +05:30
marination
cc989b62bd feat: Buying Desk, Dashboard and Reports 2020-05-05 23:58:08 +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
Nabin Hait
2305d00e0b
fix: Procurement tracker report (#21421) 
* fix: procurement report data was not coming

* fix: leave allocation minor issue
 2020-04-26 23:29:13 +05:30
Marica
5d5454ef1f
fix [ux]: Purchase Order Form Cleanup (#20932) 
* chore: Purchase Order Form Cleanup

* fix: Get Items from popups cleanup

* fix: Shift Set Target Warehouse next to Supply Raw Materials.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-26 20:07:22 +05:30
Marica
bda0ddf1cf
fix: Purchase Receipt Form Cleanup (#21232) 2020-04-21 13:15:05 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions (#21313) 2020-04-18 22:13:48 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer 
feat: Provision to set Default Item Manufacturer
 2020-04-15 16:35:08 +05:30
marination
8890b6044d fix: Patch fix, Travis fix and cleanup 
- Added UOM column in Report
- Removed mandatory on `valid_till`
- Added list view indicator for Expired status in Supplier Quotation
- Sorted Labels in Chart and syntax cleanup
- Made labels Translatable
- Fixed patch
 2020-04-15 12:31:12 +05:30
marination
8179804405 refactor: Quoted Item Comparison Report 
- Refactored Report View
- Added Chart
- Added 'valid_till' date in Supplier Quotation
- Added patch to set valid_till and daily job to set expiry status
 2020-04-14 23:05:11 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
marination
3e7a8abf29 feat: Provision to set Default Item Manufacturer 
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
 2020-04-07 21:00:57 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip 2020-04-02 21:17:52 +05:30
Deepesh Garg
bf884e8b37
Merge pull request #21092 from scmmishra/multiple-option-fix 
fix: use setup from Supplier Quotation Controller
 2020-03-31 16:28:47 +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
f144b8b205
Merge branch 'develop' into po_supplier_skip 2020-03-30 13:07:03 +05:30
Shivam Mishra
71fb8e8b57 fix: use setup from Supplier Quotation Controller 2020-03-27 20:47:04 +05:30
Deepesh Garg
3cf70a6e79 Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop 2020-03-25 21:00:25 +05:30
Deepesh Garg
e7aefc1163 fix: Add check to skip PR in supplier master 2020-03-17 11:44:02 +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
Deepesh Garg
1943fb0de4 feat: Allow PI creation without PO 2020-03-06 18:50:11 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
P-Froggy
3bf04154b1
Merge branch 'develop' into develop 2020-03-02 00:18:23 +01:00
P-Froggy
f9b3e4be78 Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop 2020-02-28 20:46:41 +01:00
P-Froggy
55d10f77f9 fix: Add linked bank accounts to supplier dashboard 2020-02-28 13:14:11 +01:00
Lokesh Waingankar
2866617c82
fix: 'Last Purchase Rate' taking wrong on BOM (#20689) 
* fix: 'Last Purchase Rate' taking wrong on BOM. #20228

* fix: Added condition for None purchase order and purchase receipt (#20689)

* fix: fetch last purchase rate

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-27 13:21:14 +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
P-Froggy
e4d8ee5ba8 Revert "Added bank account reference in supplier dashboard" 
This reverts commit 7ee8a20964.
 2020-02-18 01:05:19 +01:00