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

26768 Commits

Author SHA1 Message Date
anushka19
0fb6f9306f
fix: Accumulated depreciation (#25740) 
* fix: Accumulated depreciation

* fix: Sider issues
 2021-05-18 17:00:33 +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
Nabin Hait
bc92ecb10f bumped to version 13.3.0 2021-05-17 11:56:29 +05:50
Nabin Hait
9ec0f11800 fix: renamed change log 2021-05-17 10:50:42 +05:30
Nabin Hait
2f403f1bcd fix: renamed change log 2021-05-17 10:50:26 +05:30
Nabin Hait
ad0b8fdd1e chore: Added change log for v13.3.0 2021-05-17 10:49:21 +05:30
rohitwaghchaure
e9f6c8cdb1
fix: validation message of quality inspection in purchase receipt (#25667) 2021-05-14 12:34:13 +05:30
rohitwaghchaure
0048418c46
Merge pull request #25703 from rohitwaghchaure/change-today-to-now-for-reposting-pre 
fix: change today to now to get data for reposting
 2021-05-13 17:44:27 +05:30
Rohit Waghchaure
a0a88a710e fix: change today to now to get data for reposting 2021-05-13 17:42:06 +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
Suraj Shetty
14ca9ce1b7
Merge pull request #25635 from surajshetty3416/parallel-distributed-testing 2021-05-13 15:41:13 +05:30
Deepesh Garg
8e748f8451 fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet 2021-05-13 15:21:51 +05:30
Prssanna Desai
0eb3a38c9d
fix: quiz evalutation issue (#25671) 2021-05-13 12:17:28 +05:30
David Angulo
c55aa295fc
fix: Translate weekday when getting weekly off dates (#25691) 2021-05-13 12:16:04 +05:30
rohitwaghchaure
c29c6ff9a7
Merge pull request #25692 from rohitwaghchaure/fixed-woocommerce-order-sync-issue-pre 
fix: Woocommerce order sync issue
 2021-05-12 23:09:33 +05:30
Rohit Waghchaure
fe68a0ff80 fix: Woocommerce order sync issue 2021-05-12 23:08:16 +05:30
Suraj Shetty
75909f061c
Merge branch 'develop' into parallel-distributed-testing 2021-05-12 18:14:49 +05:30
Afshan
6578c045ca
fix: Dialog variable assignment after definition in POS (#25680) 2021-05-12 17:41:50 +05:30
rohitwaghchaure
4ec0656f64
Merge pull request #25678 from rohitwaghchaure/fixed-new-fields-not-added-pre 
fix: updated modified time in purchase invoice to pull new fields
 2021-05-12 16:39:35 +05:30
Rohit Waghchaure
aaca8335f0 fix: updated modified time to pull new fields 2021-05-12 16:36:25 +05:30
Mohammad Hasnain Mohsin Rajan
dd1822ef58
fix: change links in workspace (#25673) 2021-05-12 13:01:53 +05:30
Mohammad Hasnain Mohsin Rajan
af8436d0dc
fix: change links in workspace (#25670) 2021-05-12 13:01:03 +05:30
Nabin Hait
e38192cb6d fix: merge conflict 2021-05-11 11:15:09 +05:30
Suraj Shetty
b76ebb3f4b fix: Use frappe.safe_eval instead of eval 2021-05-11 10:59:16 +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
a13c453c69 test: Fix a case where test used to fail due to holiday list 
- fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error
 2021-05-10 20:33:47 +05:30
Suraj Shetty
404e7d07c5 test: Fix permission error 2021-05-10 18:39:09 +05:30
Deepesh Garg
83f98f6992
Merge pull request #25653 from deepeshgarg007/tax_labels 
fix: Client script breaking while settings tax labels
 2021-05-10 18:24:02 +05:30
Suraj Shetty
018ccc2b6d test: Fix test name 
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
 2021-05-10 18:01:53 +05:30
Suraj Shetty
4d6d5f4d89 test: Fix valuation rate for raw materials 2021-05-10 17:37:44 +05:30
Suraj Shetty
a132de42ca fix: allow_zero_valuation_rate for rejected qty 2021-05-10 17:25:21 +05:30
Deepesh Garg
9f0823a164 fix: Linting issues 2021-05-10 16:07:41 +05:30
Saqib
55d47a2baa
fix(pos): UI fixes related to overflowing payment section (#25652) 
* fix: additional fields overflowing in payment section

* fix: pos profile filter in pos opening dialog

* fix: item quantity pill
 2021-05-10 15:59:37 +05:30
Deepesh Garg
13dfb9734c fix: Lable for transaction child tables 2021-05-10 15:38:32 +05:30
Deepesh Garg
1a48eb49cf fix: Client script breaking while settings tax labels 2021-05-10 14:37:10 +05:30
Ganga Manoj
f2eb8dd1d5
feat: Transaction Deletion Record (#25354) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-10 14:02:58 +05:30
Ankush Menat
6e179c3092
fix: sync shopify customer addresses (#25481) 2021-05-10 13:24:26 +05:30
Saqib
9226cd3932
feat(india): reduced rate of depreciation as per IT Act (#25648) 
* feat(india): reduced rate of depreciation as per IT Act

* refactor: check date difference instead of month difference

* feat: add test for regional feature
 2021-05-10 12:36:56 +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
142ec9e99e test: Pass ConflictingTaxRule during tax rule test 2021-05-08 19:03:53 +05:30
Ganga Manoj
aa9e172091
feat: Add Create Expense Claim button in Delivery Trip (#25526) 
* feat(Delivery Trip): Add employee_code field

* feat(Expense Claim): Add Delivery Trip Number field

* feat(Delivery Trip): Add Create Expense Claim button

* feat(Delivery Trip): Make Create Expense Claim button show up after save

* fix(Delivery Trip): Fix Sider issues

* fix(Delivery Trip): Display button after submit

* fix(Delivery Trip & Expense Claim): Rename new fields

* fix(Delivery Trip): Add button in refresh

* fix(Delivery Trip): Remove redundant line

* fix(Expense Claim): Display delivery_trip only if non-empty

* fix(Delivery Trip): Add test for Create Expense Claim

* fix(Delivery Trip): Fix Sider Issue

* fix(Delivery Trip): Only display Create Expense Claim if the driver is an employee

* fix(Delivery Trip): Fix test

* fix(Delivery Trip): Fix make_expense_claim()

* fix: sider

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-08 17:15:33 +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
rohitwaghchaure
64bd4f27b8
Merge pull request #25611 from rohitwaghchaure/validation-to-check-duplicate-serial-nos 
fix: added validation in stock entry to check duplicate serial nos
 2021-05-07 23:30:27 +05:30
rohitwaghchaure
42fe07bd19
Merge pull request #25551 from rohitwaghchaure/fixed-total-stock-summary-report 
fix: total stock summary report not working
 2021-05-07 23:30:06 +05:30
rohitwaghchaure
1726ce547c
Merge pull request #25471 from rohitwaghchaure/allow-to-receipt-same-serial-no 
fix: allow to receive same serial numbers multiple times
 2021-05-07 23:27:50 +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