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

33753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
376c1eaa48
Merge pull request #22914 from newmatik/shipment_with_integration 
feat: Shipment Doctype
 2020-12-02 17:37:41 +05:30
Joshua Angelo Bienes
324622bd2a
Merge branch 'develop' into shipment_with_integration 2020-12-02 19:21:32 +08:00
Marica
cf44f1c9d3
Merge pull request #24044 from marination/gross-pay-based-on-present-days-test 
fix: Test Payment Based on Leave Application (Travis)
 2020-12-02 16:42:47 +05:30
marination
523c464a92 fix: Test Payment Based on Leave Application (Travis) 2020-12-02 16:01:35 +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
Deepesh Garg
d8aeaed6ab
Merge pull request #24039 from rohitwaghchaure/fixed-incorrect-gstr-report-issue 
fix: GSTR B2C report
 2020-12-01 20:44:33 +05:30
Saurabh
2e27f074c3 feat: reload doctype number card link 2020-12-01 18:08:04 +05:30
Rohit Waghchaure
1ac040a418 fix: GSTR report 2020-12-01 13:50:01 +05:30
Anurag Mishra
0fb05d1ba4
Merge pull request #24038 from Anurag810/bom-fix 
fix:  keyerror 'sourced_by_supplier'
 2020-12-01 13:47:06 +05:30
Shivam Mishra
9aaca25edb feat: update desk page json 2020-12-01 13:39:54 +05:30
Anurag Mishra
0e9eb95b22
Merge branch 'develop' into bom-fix 2020-12-01 13:18:00 +05:30
Leela vadlamudi
a3845a95ed
feat: Introducing telephony module (#24032) 2020-12-01 13:04:53 +05:30
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +05:30
Shivam Mishra
0b774e8ea5 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-01 11:30:53 +05:30
Nabin Hait
029b9c08dd
Update bom.py 2020-12-01 09:33:17 +05:30
Suraj Shetty
ad57eef40c
fix(product-listing): Check if customer exists (#24030) 
- It might happen that perty_name might not always be Customer
(it might be Supplier as well)
 2020-12-01 09:14:57 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll (#23519) 
* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* Update asset_value_adjustment.py

* patch: update columns

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* patch: update columns

* Update asset_value_adjustment.py

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: Added company field in leave encashment and employee benefit

* refactor: Refactored multi-currency payroll patch

* fix: currency column in salary register

* refactor: Refactored code for making bank and return entry against employee advance

* fix: minor cleanup

* fix: fixed translation

* fix: removed salary component type

* fix: fixed sider issues

* fix: translation and slider

* style: formatted msg

* fix: fixed slider

* fix: travis

* fix: refactor

* fix: slider

* fix: slider

* fix: slider

* fix: travis

* fix: patch

* fix: patch

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: re-run travis

* fix: rerun travis

* fix: rerun travis

* fix: rerun travis

* fix: travis rerun

* fix: increased throttle_user_limit from 60 to 100

* fix: patch

* fix: patch

* fix: assign payroll payable account as default payroll payable account in SSA

* fix: removed debugger

* fix: slider

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-12-01 09:11:05 +05:30
Saqib Ansari
188e0ecbcb fix: submit order summary center alignment 2020-11-30 17:53:57 +05:30
Anurag Mishra
66e8a12d0f fix: KeyError 'sourced_by_supplier' 2020-11-30 17:53:28 +05:30
Saqib Ansari
02d1491e39 fix: order summary qty alignment 2020-11-30 17:42:51 +05:30
Saqib Ansari
19d5074c25 fix: get formatted value in 'taxes' print template 2020-11-30 15:49:00 +05:30
Shivam Mishra
27e7c264f2 fix: link type 2020-11-30 14:58:16 +05:30
Shivam Mishra
3e6cdea51f feat: delete config python files 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
Afshan
7e2d8ca916 fix: Handle the "no leave_allocation found" case (#23922) 
* fix: Handle the "no leave_allocation found" case

* fix: format of error msg
 2020-11-30 14:58:00 +05:30
Marica
1466ed4579 fix: Don't copy terms and discount from SO to PO (#23903) 
* fix: Dont copy terms, discount and required by from SO to PO

* fix: Let delivery date and required by date get mapped
 2020-11-30 14:58:00 +05:30
Suraj Shetty
c8b5f982ac fix: Typo (Enchashment > Encashment) (#23919) 2020-11-30 14:58:00 +05:30
Afshan
8c3b2d0a0d fix: change query to frappe.get_all 2020-11-30 14:58:00 +05:30
Afshan
beb1811523 fix: payroll attendance error 2020-11-30 14:58:00 +05:30
marination
d0ee615c2c chore: Pricing Rule with Item Price Test 2020-11-30 14:58:00 +05:30
marination
8e2ce641c3 fix: Dont overrule Item Price via Pricing Rule Rate if 0 2020-11-30 14:58:00 +05:30
Anurag Mishra
58a3fea1b7 fix: Error handling in Upload Attendance (#23907) 2020-11-30 14:58:00 +05:30
Raffael Meyer
896e4b1722 fix: improve UX of DATEV report (#23892) 
* feat(DATEV Settings): button to show report

* feat(desk): add DATEV to Reports under Accounting

* fix(report DATEV): last calendar month as default

* fix: let user create DATEV Settings

(Instead of showing an error message.)
 2020-11-30 14:58:00 +05:30
Kenneth Sequeira
39102e68df fix: make contract template editable (#23891) 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
Raffael Meyer
59be7ff144 feat: make account number length configurable (#23845) 2020-11-30 14:58:00 +05:30
Raffael Meyer
1ea12079da fix: fiscal year can be shorter than 12 months (#23838) 
* fix: replace unnecessary SQL query

* feat: checkbox "Is Short Year"

Also, set checkbox and dates only once.

* fix: toggle no longer necessary

Date fields use set_only_once.

* feat: short years can be less than 12 months

* fix: if short year, don't add 12 months to start date

* test: short year

* fix: move short fiscal year to test records
 2020-11-30 14:58:00 +05:30
Marica
ecce3bca2f chore: PO cleanup (#23774) 
* chore: Subcontracting section and items section enhancement

- Set target warehouse moved to Items section
- Added subcontraction label to supply RM section

* chore: PO & PO Item Form Cleanup

* chore: PO Get Items from cleanup

* fix: Taxes and Charges field visibility

* chore: Cleanup

* fix: Translation styling
 2020-11-30 14:58:00 +05:30
Rohit Waghchaure
d6a2b390dc fix: not able to save bom 2020-11-30 14:58:00 +05:30
Deepesh Garg
7b16c55c9a feat: Sync old shopify orders (#23841) 
* feat: Sync old shopify orders

* fix: Old orders syncing by date

* fix: Remove unnecessary code

* fix: Remove unintentional changes

Co-authored-by: Saurabh <saurabh@erpnext.com>
 2020-11-30 14:58:00 +05:30
Anurag Mishra
a81e872cdb fix: added wrong absent days calculation in salary slip 2020-11-30 14:57:27 +05:30
Anurag Mishra
8b6c58d560
Merge pull request #24005 from Anurag810/leave_ledger_patch 
fix: ignore exception during leave ledger creation from patch
 2020-11-30 13:26:47 +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