Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,147 Commits 3 Branches 0 Tags 1 GiB
7e1511f527
Commit Graph

24121 Commits

Author SHA1 Message Date
Marica
7e1511f527
Merge branch 'develop' into purchase-invoice-payment-terms 2020-11-06 12:28:55 +05:30
Marica
9694432270
Merge branch 'develop' into dialog-cleanup 2020-11-06 12:19:41 +05:30
Anupam Kumar
3a9dc90695
fix: fix: replaced formatdate -> format_date (#23829) 2020-11-05 18:51:56 +05:30
rohitwaghchaure
9a62858da2
Merge pull request #23831 from rohitwaghchaure/incorrect-assign-to-in-asset-maintenance-develop 
fix: incorrect assign to in Maintenance Schedule
 2020-11-05 18:43:51 +05:30
Marica
c070f2ed57
Merge branch 'develop' into dialog-cleanup 2020-11-05 18:37:56 +05:30
Marica
08f6c9d5f9
Merge pull request #23820 from marination/so-to-po-dialog-fix 
fix: SO to PO Mapping Issue
 2020-11-05 18:29:52 +05:30
Saqib
bc919e2e7d
fix: cannot expand row in update items dialog (#23839) 2020-11-05 17:38:35 +05:30
Saqib
19df4534f5
fix: asset finance book depreciation posting date fix (#23833) 2020-11-05 16:37:40 +05:30
Afshan
5c93ca7bef
fix: leave ledger patch (#23807) 
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-11-05 15:45:15 +05:30
Rohit Waghchaure
421348a5f2 fix: not able to select assign to 2020-11-05 15:43:41 +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
Marica
7e9b9e7278
Merge branch 'develop' into so-to-po-dialog-fix 2020-11-05 12:19:49 +05:30
Marica
9a4975d3fe
Merge pull request #23823 from marination/delete-quoted-item-old-report 
chore: Delete Quoted Item Comparison Report
 2020-11-05 12:19:26 +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
Marica
6ae1b269ea
Merge branch 'develop' into delete-quoted-item-old-report 2020-11-05 09:32:47 +05:30
Marica
364916fa7b
Merge branch 'develop' into dialog-cleanup 2020-11-05 09:27:57 +05:30
Marica
2f0bd68fde
Merge branch 'develop' into so-to-po-dialog-fix 2020-11-05 09:25:00 +05:30
marination
2b3412ea05 chore: Reposition RFQ fields 2020-11-04 22:07:33 +05:30
Marica
4c81de0810
Merge branch 'develop' into so-to-po-dialog-fix 2020-11-04 21:24:45 +05:30
marination
5de719fc74 chore: Delete Quoted Item Comparison Report 2020-11-04 21:22:22 +05:30
marination
2b8aa91cf2 fix: Make sure row object has doctype so that read only property is applied to rows 2020-11-04 21:00:52 +05:30
Rucha Mahabal
13fb562e9c fix: sider 2020-11-04 20:25:10 +05:30
Rucha Mahabal
2673c19c1a fix: therapy plan and session fixes 2020-11-04 20:06:07 +05:30
marination
23b7591c91 fix: SO to PO Mapping Issue 
- removed type: GET , which made the URL longer
- Added only relevant fields from Items table to Dialog table to reduce args load
- Made separate method to set table data in dialog
- Added freeze message
 2020-11-04 18:23:00 +05:30
Anurag Mishra
09b8ca0ddb fix: list index out of range on incilding uom 2020-11-04 15:04:50 +05:30
rohitwaghchaure
0fde102ea5
Merge pull request #23812 from rohitwaghchaure/fixed-sequence-id-column-display 
fix: on save sequence id column override with workstation
 2020-11-04 14:25:15 +05:30
rohitwaghchaure
9a0325e2b9
Merge pull request #23801 from rohitwaghchaure/fixed-budget-test-cases 
fix: Budget test cases
 2020-11-04 13:27:03 +05:30
Rohit Waghchaure
dd87bcfda0 fix: on save sequence id column override with workstation 2020-11-04 13:26:03 +05:30
Rohit Waghchaure
81b2c8ed60 fix: sequence id override with operation column 2020-11-04 13:10:03 +05:30
Mangesh-Khairnar
2df2b2f351
fix: update integrations desk page (#23767) 
* fix: update integrations desk page

* fix: setup dashboard after receiving API callback

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-11-04 12:48:33 +05:30
Mangesh-Khairnar
1354aecafa
fix: add check for allowing access to european region (#23770) 2020-11-04 12:42:02 +05:30
Frappe PR Bot
f4e410af5f
chore: Update translations (#23787) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-11-04 12:17:40 +05:30
rohitwaghchaure
a53454d3d1
Update test_budget.py 2020-11-04 12:06:21 +05:30
Rohit Waghchaure
c8cc4bfc56 fix: Budget test cases 2020-11-03 17:09:09 +05:30
Marica
7b42e8e27c
Merge branch 'develop' into dialog-cleanup 2020-11-03 16:26:06 +05:30
Rucha Mahabal
ce8b5fc5ca
Merge branch 'develop' into fix-ipme 2020-11-03 13:56:53 +05:30
Rucha Mahabal
7190e1e4bb fix: Inpatient Medication Order and Entry fixes 2020-11-03 13:45:12 +05:30
Saqib
da878c43fc
fix: cannot save customer email & phone (#23797) 2020-11-03 10:51:09 +05:30
Saqib
c95dff7b7d
fix: cannot add items to cart (#23796) 
* fix: _ is not defined

* fix: item image alt gets overflowed due to large text

* fix: available item qty in pos search

* fix: cash shortcuts overflow
 2020-11-03 10:16:58 +05:30
Deepesh Garg
992bd69fc4
Merge pull request #23785 from deepeshgarg007/place_of_supply 
fix: Place of Supply fix in Sales Invoices
 2020-11-02 11:23:25 +05:30
marination
542ae6ab97 chore: Linter and Sider fixes 
- Translatable  strings cannot be multi line or be formatted by '+'
- Reduce no of tabs in stock_entry.js
 2020-11-02 08:50:48 +05:30
Deepesh Garg
eacfd792e6 fix: fieldname 2020-10-30 22:12:24 +05:30
Deepesh Garg
db3fa4e6b2 fix: Place of Supply fix in Sales Invoices 2020-10-30 19:19:48 +05:30
marination
97d38548aa chore: Purchase Invoice Get Items From cleanup 2020-10-30 17:50:25 +05:30
marination
66b2b544f8 chore: Purchase Receipt, added required by date in PO popup 2020-10-30 17:45:28 +05:30
marination
08e5031be2 chore: Supplier Quotation Get Items From cleanup 2020-10-30 17:36:20 +05:30
marination
e14fdf4a3c chore: RFQ cleanup and Title case for 'Get Items From' 
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
 2020-10-30 17:06:00 +05:30
rohitwaghchaure
c451c08824
Merge pull request #23777 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry-develop 
fix: po_detail field has no value for subcontracted stock entry
 2020-10-30 16:48:11 +05:30
rohitwaghchaure
ce7f9dffa9
Merge pull request #23781 from rohitwaghchaure/patch-to-update-reason-for-leaving 
fix: patch to update reason for leaving in employee
 2020-10-30 16:47:48 +05:30