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

1785 Commits

Author SHA1 Message Date
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes (#24285) 2021-01-05 13:53:51 +05:30
Deepesh Garg
a873ae0d9f fix: Check for custom dimensions 2021-01-04 14:23:31 +05:30
Deepesh Garg
23ab5c5cc0 fix: Multiplle sider issues 2020-12-31 11:29:06 +05:30
Deepesh Garg
4a8c2c4cb5 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-29 15:10:36 +05:30
rohitwaghchaure
527b7e16e5
Revert "feat: Batch wise item selling pricing" 2020-12-28 15:29:30 +05:30
Deepesh Garg
d3814b2676 Merge branch develop into batch-wise-pricing 2020-12-28 10:48:29 +05:30
Leela vadlamudi
29778e2fba
feat: Voice Call Settings doctype added (#24126) 2020-12-15 21:23:17 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company (#24021) 
* fix: Accounting for internal transfer invoices within same company

* fix: warehouse fetching

* fix: Linting issues

* fix: GL entry fixes and validation for intercompany account

* fix: Account naming changes and other fixes

* fix: Add test for internal transfer

* fix: Test Case

* fix: Add description for fields

* fix: Commonfied code

* fix: Map warehouse and serial no
 2020-12-11 21:30:39 +05:30
Marica
3bc69e59ec
Merge branch 'develop' into update-barcode-if-scan-barcode-used 2020-12-10 18:05:00 +05:30
Mohammad Hasnain Mohsin Rajan
8abe7b91fe
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:22 +05:30
Mohammad Hasnain Mohsin Rajan
ce1ca28296
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:05 +05:30
Deepesh Garg
bc0a2859e4 fix: Rate for items with no batch 2020-12-09 12:40:09 +05:30
Mohammad Hasnain Mohsin Rajan
deaf2e80cb
fix: linting 2020-12-09 12:36:14 +05:30
Mohammad Hasnain
69514c4761 fix: scan barcode does not update barcode item field in sales order 2020-12-09 12:10:28 +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
Marica
afc517b8bf
Merge branch 'develop' into link-to-mr 2020-12-04 16:30:40 +05:30
Deepesh Garg
7b2d518059 fix: Dimension filters in accounting reports 2020-12-04 11:28:26 +05:30
Deepesh Garg
12b45b3f2a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-02 12:46:23 +05:30
Leela vadlamudi
a3845a95ed
feat: Introducing telephony module (#24032) 2020-12-01 13:04:53 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return 2020-11-25 17:24:03 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings (#24004) 
* fix: translation strings

* fix: linting
 2020-11-25 15:37:54 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates (#23998) 
* feat: add company filter to tax templates

* fix: remove filer from PO because it is from tran

* fix: linting

* fix: solve translation string issues

* fix: remove doctype name
 2020-11-25 15:36:41 +05:30
Deepesh Garg
1a4390de44 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e fix: Move filter setup to doctype controllers 2020-11-25 14:49:10 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return 2020-11-25 10:43:55 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings (#23783) 
* fix: start_pattern

* fix: translatable strings

* fix: add missing semicolon (task)

* fix: add missing semicolon (setup_wizard)

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: move out HTML element as variable

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: pull out message, translate "Undo".

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: typo

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Revert "fix: start_pattern"

This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-11-25 09:11:51 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return 2020-11-19 12:21:38 +05:30
Deepesh Garg
9e9ea96582 fix: linting 2020-11-16 12:03:47 +05:30
Deepesh Garg
f916bc048f fix: Remove cost center query from doctypes 2020-11-15 22:44:39 +05:30
Deepesh Garg
6e5748e2a3 fix: dimension filter query 2020-11-15 22:43:48 +05:30
Deepesh Garg
96e874bfda fix: dimension filter query 2020-11-15 22:43:01 +05:30
Jannat Patel
a9e02bba77
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue 2020-11-11 16:46:01 +05:30
pateljannat
7e4d115e36 fix: sider issues fixed 2020-11-11 09:52:27 +05:30
pateljannat
b648b9cf93 fix: code review changes 2020-11-10 18:50:02 +05:30
UrvashiKishnani
bc64f5dfbb
fix: spelling error in filter label (#23867) 2020-11-09 20:14:06 +05:30
Suraj Shetty
e3fe8ff195
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue 2020-11-09 19:16:23 +05:30
Marica
d845e8a53a
Merge branch 'develop' into pr-dn-return 2020-11-06 12:25:11 +05:30
Marica
c070f2ed57
Merge branch 'develop' into dialog-cleanup 2020-11-05 18:37:56 +05:30
pateljannat
5b02d32826 fix: trailling spaces removed 2020-11-05 18:04:14 +05:30
Saqib
bc919e2e7d
fix: cannot expand row in update items dialog (#23839) 2020-11-05 17:38:35 +05:30
pateljannat
403822afb3 fix: correcting description field in taxes and charges for accounts that have account number + account name 2020-11-05 16:24:33 +05:30
marination
28dd90f3dc Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return 2020-11-02 15:16:31 +05:30
marination
d6596a169c fix: Billing % Logic and Map Pending Qty only in PR and DN 
- Billing % should consider unreturned amount as total
- While mapping to return doc, map unreturned amount
- Added field Received Qty in Stock UOM, to tally against Returned Qty in PR
- PR billing percentage updation custom function
- In patch set received qty in stock uom first, then update returned qty and billing
 2020-11-02 15:07:48 +05:30
Marica
e0ec58d8fa
Merge branch 'develop' into link-to-mr 2020-11-01 23:48:58 +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
Marica
8f6bd851d3
chore: Show Toast alert feedback on Scanning Barcode (#23760) 2020-10-29 18:55:52 +05:30
Saqib
7d9dd3c628
fix: item wise tax calculation (#23744) 2020-10-28 17:07:10 +05:30
Marica
16a1f7e7e3
Merge branch 'develop' into link-to-mr 2020-10-27 11:49:35 +05:30