Shivam Mishra
|
e40926b4cc
|
fix: don't use primary action for create
|
2020-12-22 11:17:14 +05:30 |
|
Rushabh Mehta
|
2cd41bca06
|
fix(routes): desk to app
|
2020-12-18 13:17:58 +05:30 |
|
Shivam Mishra
|
fd044b032f
|
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
|
2020-12-16 13:21:10 +05:30 |
|
Suraj Shetty
|
f2511c84b5
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-12-14 09:05:48 +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 |
|
Rushabh Mehta
|
fec8dba16c
|
fix(merge): merge develop
|
2020-12-08 16:23:09 +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 |
|
Shivam Mishra
|
2fa3cac814
|
feat: update workspace folders
|
2020-12-03 15:48:57 +05:30 |
|
Shivam Mishra
|
2895645f86
|
feat: rename desk page to workspace
|
2020-12-03 15:39:53 +05:30 |
|
Rohit Waghchaure
|
8474476316
|
fix: incorrect balance value in stock balance report
|
2020-12-03 13:43:11 +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 |
|
Shivam Mishra
|
9aaca25edb
|
feat: update desk page json
|
2020-12-01 13:39:54 +05:30 |
|
Shivam Mishra
|
de68f74b4c
|
chore: update all desk pages
|
2020-12-01 12:51:38 +05:30 |
|
Shivam Mishra
|
27e7c264f2
|
fix: link type
|
2020-11-30 14:58:16 +05:30 |
|
Shivam Mishra
|
61388d412b
|
feat: update desk pages
|
2020-11-30 14:58:00 +05:30 |
|
rohitwaghchaure
|
9707b4789e
|
fix: stock ageing report not working (#23923)
|
2020-11-30 14:58:00 +05:30 |
|
rohitwaghchaure
|
10c168e257
|
fix: default cost center in item master not set in stock entry (#23877)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
|
2020-11-30 14:58:00 +05:30 |
|
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 |
|
Rushabh Mehta
|
542bc01718
|
fix(minor): update routes
|
2020-11-18 15:00:34 +05:30 |
|
rohitwaghchaure
|
7aa60d1dea
|
fix: stock ageing report not working (#23923)
|
2020-11-17 12:10:27 +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 |
|
Shivam Mishra
|
bed717b442
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-11-12 11:32:59 +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 |
|
Marica
|
63d1a0436c
|
Merge branch 'develop' into fix-po-no-fetching
|
2020-11-09 12:59:10 +05:30 |
|
Marica
|
7e1511f527
|
Merge branch 'develop' into purchase-invoice-payment-terms
|
2020-11-06 12:28:55 +05:30 |
|
Marica
|
d845e8a53a
|
Merge branch 'develop' into pr-dn-return
|
2020-11-06 12:25:11 +05:30 |
|
Marica
|
6d2bcd2404
|
Merge branch 'develop' into purchase-invoice-payment-terms
|
2020-11-05 12:25:38 +05:30 |
|
Marica
|
fd2b7d3c1d
|
Merge branch 'develop' into dialog-cleanup
|
2020-11-05 12:22:50 +05:30 |
|
rohitwaghchaure
|
64059db69f
|
Merge pull request #23814 from Anurag810/stock_ledger_report
fix: list index out of range on including UOM
|
2020-11-05 11:49:46 +05:30 |
|
Afshan
|
cdc17bb9f3
|
fix: added code for testing
|
2020-11-04 19:28:55 +05:30 |
|