Commit Graph

34103 Commits

Author SHA1 Message Date
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
a45f98ba99
Merge branch 'develop' into pr-dn-return 2020-11-05 10:34:23 +05:30
Marica
6ae1b269ea
Merge branch 'develop' into delete-quoted-item-old-report 2020-11-05 09:32:47 +05:30
Marica
6bbdc58d56
Merge branch 'develop' into link-to-mr 2020-11-05 09:31:39 +05:30
Marica
144fef0097
Merge branch 'develop' into item-price-pricing-rule-conflict 2020-11-05 09:28:30 +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
Marica
24d0bd4435
Merge pull request #23826 from marination/rfq-test-fixes
chore: Reposition RFQ fields
2020-11-05 09:24:18 +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
Rucha Mahabal
f68586ac79
Merge pull request #23817 from ruchamahabal/fix-therapy-plan-template
fix: therapy plan and session fixes
2020-11-04 21:08:10 +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
igormbq
aa08fb9716 Add location on Asset to use make_demo 2020-11-04 11:40:57 -03:00
Rucha Mahabal
2673c19c1a fix: therapy plan and session fixes 2020-11-04 20:06:07 +05:30
Afshan
cdc17bb9f3 fix: added code for testing 2020-11-04 19:28:55 +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
rohitwaghchaure
d961d6cdc9
Merge pull request #23810 from rohitwaghchaure/sequence-id-column-override-withoperation
fix: sequence id override with workstation column
2020-11-04 13:13:36 +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
Mohammad Hasnain
bed4e85aec fix(uae vat 201): date filters were not working 2020-11-04 10:44:22 +05:30
Mohammad Hasnain
510d0d3f20 Merge branch 'UAE-VAT-Format' of https://github.com/hasnain2808/erpnext into UAE-VAT-Format 2020-11-04 10:32:22 +05:30
Mohammad Hasnain
f2c895ddb5 feat(uae vat 201): do not take zero and nil rated items in standard rated expense emiratewise 2020-11-04 10:31:37 +05:30
Mohammad Hasnain Mohsin Rajan
2b2961678c
Merge branch 'develop' into UAE-VAT-Format 2020-11-04 08:43:21 +05:30
marination
7837161a3f fix: Sider 2020-11-03 22:09:42 +05:30
marination
574477187f chore: Pricing Rule with Item Price Test 2020-11-03 20:22:48 +05:30
Marica
cf08f0da70
Merge branch 'develop' into item-price-pricing-rule-conflict 2020-11-03 18:29:22 +05:30
pateljannat
846ff323e2 feat: sales order status filter for production plan 2020-11-03 17:35:44 +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
marination
53b1a9a40b chore: Add Test for missing debit account 2020-11-03 15:56:09 +05:30
Rucha Mahabal
b7e84f70c9
Merge pull request #23799 from ruchamahabal/fix-ipme
fix: Inpatient Medication Order and Entry fixes
2020-11-03 15:43: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
Marica
9a75a60784
Merge branch 'develop' into debit-credit-opening-invoice-tool 2020-11-03 12:03:50 +05:30
marination
f21e3fbf04 chore: Tests
- Added test for mapping secnd return doc
- Added test for billing % of partially returned doc
- Handled PR with 0 billing amount
2020-11-03 12:01:56 +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
Kevin Chan
a2ba8ea74a style: Clean up code formatting 2020-11-03 10:57:52 +08:00
Kevin Chan
312561fd77 Merge branch 'develop' into fix/item-price-duplicate-checking 2020-11-03 10:56:23 +08:00
Mohammad Hasnain Mohsin Rajan
6a0b28bde3
Merge branch 'develop' into UAE-VAT-Format 2020-11-02 23:59:13 +05:30
marination
3991b84b2b chore: Avoid multiline string in Translation & remove print statement 2020-11-02 15:23:41 +05:30