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

4546 Commits

Author SHA1 Message Date
Suraj Shetty
3e6cc5037b fix: Remove unnecessary code 2021-05-21 17:37:19 +05:30
Suraj Shetty
81d49e9c71 fix: Use extend_cscript function to properly extend class methods to cscript 2021-05-21 17:03:09 +05:30
Deepesh Garg
9de1a45185
Merge pull request #25699 from Anuja-pawar/fix_process_statement_report 
fix: Process Statement of Accounts formatting
 2021-05-19 19:21:43 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
Nabin Hait
8b2fef11b1 fix: merge conflict 2021-05-17 11:37:14 +05:30
Mohammad Hasnain Mohsin Rajan
7c6de1a8ac
fix: bank statement import via google sheet (#25677) 
* fix: change links in workspace

* fix: google sheet bank statement import

* chore: quotes

* fix: capitalization

* fix: typo

* chore: add translation
 2021-05-13 17:28:49 +05:30
Anuja Pawar
b28889c6f7
Merge branch 'develop' into fix_process_statement_report 2021-05-13 16:23:06 +05:30
Anuja P
e90a2a346b fix: update new changes 2021-05-13 15:15:47 +05:30
Anuja P
554c91d638 fix: solved conflicts 2021-05-13 14:48:38 +05:30
Anuja P
ab1ae418cc fix: Process SOA enhancement 2021-05-13 14:26:27 +05:30
Rohit Waghchaure
aaca8335f0 fix: updated modified time to pull new fields 2021-05-12 16:36:25 +05:30
Deepesh Garg
d2520680bc
fix: Error on applying TDS without party (#25632) 
* fix: Error on applying TDS without party

* fix: Add placeholder value
 2021-05-10 21:17:06 +05:30
Suraj Shetty
b3fadebb41 style: Fix sider issues 2021-05-10 20:49:07 +05:30
Suraj Shetty
a132de42ca fix: allow_zero_valuation_rate for rejected qty 2021-05-10 17:25:21 +05:30
Suraj Shetty
ec6b652cd4 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-10 09:18:25 +05:30
Suraj Shetty
2ac27d774d test: Fix test dependency 2021-05-09 14:38:28 +05:30
Suraj Shetty
80aa8a3149 Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing 2021-05-08 11:28:27 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button (#25413) 
* feat!: add pick batch button

BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* style: add sider review changes

* refactor: make consice, extract function

* refactor: camel to snake casing
 2021-05-07 20:30:04 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual (#25613) 
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
 2021-05-07 20:28:51 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447 fix: Update bundle paths 2021-05-07 14:53:42 +05:30
Saqib
27cf19a19f
feat(pos): show POS reserved stock in stock projected qty report (#25593) 
* feat(pos): consider POS reserved stock in stock projected qty report

* chore: remove unwanted string formats
 2021-05-07 13:37:42 +05:30
HENRY Florian
3ecd7ac4c7
fix: Add french chart accounts with account number (#25009) 
* fix: Add french chart accounts with account number

* fix actual franch plan
 2021-05-07 13:33:12 +05:30
Umair Sayed
7f79d463f6
fix: Stock and Accounts Settings form refactor (#25534) 
* stock and accounts settings page

* fix: Stock and accounts settings page cleanup

Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air.local>
 2021-05-07 12:28:57 +05:30
Alan
0e0de6baa1
fix: prevent spurious defaults for items when making prec from dnote (#25559) 
* fix: prevent spurious defaults for items when making prec from dnote

* refactor: make concise, use dict comp
 2021-05-07 11:40:02 +05:30
Nabin Hait
7481f54e0c Merge branch 'version-13' into develop 2021-05-06 19:18:18 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard (#25606) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard (#25605) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:13:54 +05:30
Suraj Shetty
bdf8c528f1 test: Fix dependencies 2021-05-06 18:37:14 +05:30
Suraj Shetty
c5430afe2d test: Fix test_dependencies 2021-05-06 17:44:26 +05:30
Saqib
92cefd5655
feat(pos): ability to retry on pos closing failure (#25604) 
* feat(pos): ability to retry on pos closing failure

* fix: sider issues

* fix: sider issues

* fix: mark all queued closing entry as failed

* feat: add headline message
 2021-05-06 17:03:16 +05:30
Saqib
900a8fb21a
feat(pos): ability to retry on pos closing failure (#25595) 
* feat(pos): ability to retry on pos closing failure

* fix: sider issues

* fix: sider issues

* fix: mark all queued closing entry as failed

* feat: add headline message
 2021-05-06 17:02:47 +05:30
Deepesh Garg
9dd0a26e92
Merge pull request #25598 from deepeshgarg007/payment_reco_invoice_fix 
fix: Invoices not getting fetched during payment reconciliation
 2021-05-06 15:49:19 +05:30
Deepesh Garg
85b675a554 fix: Invoices not fetch during payment reconciliation 2021-05-05 20:57:31 +05:30
18alantom
136eb30081 fix: use get_serial_nos for splitting 2021-05-05 12:26:29 +05:30
Hendy Irawan
05f9df6c10 fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled) 
Fixed #25572 Period Closing Voucher incorrect journal entry amount for
Income/Expenses Accounts containing canceled transactions.
 2021-05-04 13:32:16 +00:00
barredterra
24e2cc9107 Merge branch 'develop' into datev_fixes 2021-05-03 18:19:28 +02:00
Nabin Hait
0c7448fc41 fix: Fixed merge conflict 2021-05-01 14:54:22 +05:30
Nabin Hait
a2fcca85a5 fix: Fixed merge conflict 2021-05-01 14:53:13 +05:30
Afshan
1fd1e2bb60
fix: fieldname when updating docfield property (#25517) 2021-04-30 18:41:26 +05:30
Raffael Meyer
07a081d8ac
Merge branch 'develop' into datev_fixes 2021-04-30 12:25:40 +02:00
Deepesh Garg
88d40e8dc4 fix: Remove extra space 2021-04-30 15:33:33 +05:30
Deepesh Garg
1deef5229e fix: Linting and translation issues 2021-04-30 15:20:55 +05:30
Deepesh Garg
bd5ee7d725 fix: Use party account currency 2021-04-30 15:20:45 +05:30
Deepesh Garg
9cbca06f4e fix: Updated filters for process statement of accounts 2021-04-30 15:20:31 +05:30
Deepesh Garg
303f6d2d36 Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into psoa_fixes_v13_pre_release 2021-04-30 15:17:07 +05:30
Deepesh Garg
178938b2f0 fix: Ageing errors in PSOA 2021-04-30 15:14:24 +05:30
Deepesh Garg
c4231c72a6
Merge pull request #25524 from aerele/develop 
fix: List invoices in Payment Reconciliation Payment
 2021-04-30 14:15:33 +05:30
Anuja P
435e93bda9 fix: allocated amount change wrt paid amount change 2021-04-30 13:52:48 +05:30
Deepesh Garg
8aa57953ee
Merge pull request #25490 from deepeshgarg007/psoa_fixes_v2 
fix: Ageing errors in PSOA
 2021-04-30 13:07:00 +05:30