rohitwaghchaure
|
f851eed7b4
|
Merge pull request #24048 from rohitwaghchaure/fixed-incorrect-balance-value-in-stock-balance-develop
fix: incorrect balance value in stock balance report
|
2020-12-03 13:45:07 +05:30 |
|
Rohit Waghchaure
|
8474476316
|
fix: incorrect balance value in stock balance report
|
2020-12-03 13:43:11 +05:30 |
|
Kenneth Sequeira
|
131e46bab7
|
chore: add help section for Jinja
|
2020-12-02 21:37:55 +05:30 |
|
Kenneth Sequeira
|
9abc685504
|
feat: add jinja templating in contract template
|
2020-12-02 21:13:50 +05:30 |
|
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 |
|
Deepesh Garg
|
12b45b3f2a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
|
2020-12-02 12:46:23 +05:30 |
|
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
|
59820004b8
|
fix: Exception naming
|
2020-12-02 12:34:59 +05:30 |
|
Deepesh Garg
|
ab5053ef9c
|
fix: Accounting dimension import in PCV
|
2020-12-02 12:34:40 +05:30 |
|
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 |
|
Rucha Mahabal
|
288853d8f0
|
Merge branch 'develop' into patient-history-enhancements
|
2020-12-01 13:44:16 +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 |
|
Rucha Mahabal
|
f6756838ba
|
fix: patch
|
2020-11-30 17:51:56 +05:30 |
|
Saqib Ansari
|
02d1491e39
|
fix: order summary qty alignment
|
2020-11-30 17:42:51 +05:30 |
|
Rucha Mahabal
|
b5b8c5474a
|
refactor: move call to fetch doctype fields to server-side
|
2020-11-30 16:09:15 +05:30 |
|
Saqib Ansari
|
19d5074c25
|
fix: get formatted value in 'taxes' print template
|
2020-11-30 15:49:00 +05:30 |
|
Rucha Mahabal
|
0d43ea5ebb
|
refactor: show Patient History feed as per configured date instead of creation
|
2020-11-30 15:00:42 +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 |
|