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

26971 Commits

Author SHA1 Message Date
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts (#25714) 2021-05-25 20:39:17 +05:30
Ganga Manoj
18cfced032
fix(Material Request): Make status on list and form view the same (#24856) 2021-05-25 19:54:07 +05:30
Ganga Manoj
99636c6aca
fix: rearrange buttons for company doctype (#25617) 2021-05-25 19:17:01 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions (#25654) 2021-05-25 19:16:02 +05:30
Laurynas Sakalauskas
6a62ad325f
fix(plaid): withdrawals and deposits are recorded incorrectly (#25784) 2021-05-25 19:09:44 +05:30
Rakshith N
507a211c81
fix: fetch email id from dialog box in pos past order summary' (#25808) 2021-05-25 19:03:29 +05:30
noahjacob
73e41c0bd6 refactor: suggested changes 2021-05-25 18:01:47 +05:30
Anuja P
3efd411ddb fix: Hold status is added in the report 2021-05-25 16:24:01 +05:30
Deepesh Garg
09d9bd19ac
Merge pull request #25816 from deepeshgarg007/jv_diff_ignore_v13 
fix: Ignore rounding diff while importing JV using data import
 2021-05-25 10:59:50 +05:30
rohitwaghchaure
bc7c5bfbe2
Merge pull request #25817 from rohitwaghchaure/fix-removed-serial-no-validate-for-sales-invoice 
fix: removed serial no validation for sales invoice
 2021-05-25 10:40:46 +05:30
Rohit Waghchaure
b4f0347c02 fix: removed serial no validation for sales invoice 2021-05-24 23:39:25 +05:30
Deepesh Garg
7c0383a9a6
Merge pull request #25815 from deepeshgarg007/cash_flow_mapper_v13 
fix: Cashflow mapper not showing data
 2021-05-24 20:40:07 +05:30
Anurag Mishra
5670cf4386
feat: enhancements in Training Event (#25782) 
* feat: Some Minor fixes

* fix: patch file

* fix: patch

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-24 20:24:20 +05:30
Deepesh Garg
25112244ed fix: Ignore rounding diff while importig JV using data import 2021-05-24 20:01:21 +05:30
Deepesh Garg
c348215f61 fix: Cashlfow mapper not showing data 2021-05-24 19:57:53 +05:30
Deepesh Garg
63e4ab4f2d
Merge pull request #25777 from Anuja-pawar/fix-process-SOA-format 
fix: Process Statement of Accounts formatting
 2021-05-24 19:55:21 +05:30
Saqib
dd5b31f8c4
fix: set disable rounded total if it is globally enabled (#25789) 2021-05-24 18:23:03 +05:30
Saqib
b6d061fa8c
fix(pos): handle db lock timeout error while pos closing (#25813) 2021-05-24 18:22:03 +05:30
Ankush Menat
15f8a0fb22
test: fix flaky test 2021-05-24 17:55:39 +05:30
Ankush Menat
3aed662f46
chore: translation / semgrep / sider fixes 2021-05-24 17:55:39 +05:30
Ankush Menat
c15fef571f
test: item naming series behaviour 2021-05-24 17:55:39 +05:30
Ankush Menat
76dd6e9046
test: contextmanager to change settings 2021-05-24 17:55:39 +05:30
Ankush Menat
42e057d079
test: add test for get_timeline_data in item 2021-05-24 17:55:38 +05:30
Ankush Menat
e971b4592e
test: add test for is_stock_item 2021-05-24 17:55:38 +05:30
Ankush Menat
57266a7343
refactor: check_stock_uom_with_bin 2021-05-24 17:55:38 +05:30
Ankush Menat
fc54cf68ac
test: add tests for checking stock_uom with bin 2021-05-24 17:55:38 +05:30
Ankush Menat
4e360f805f
test: hoist defaults to function signature 2021-05-24 17:55:38 +05:30
Ankush Menat
eb17732876
test: add test for item attribute completion 2021-05-24 17:55:37 +05:30
Ankush Menat
f5a937bc45
test: check index creation on item table 2021-05-24 17:55:37 +05:30
Ankush Menat
b9fa12d572
test: add tests for uom conversion function 2021-05-24 17:55:37 +05:30
Ankush Menat
019be66b7b
fix: consider all UOMs for intermediate conversion 
- Using `get_value` will restrict intermediate UOM to first UOM that is
  found.
- A self join is required to truly capture the required behaviour.
- Add explanation and examples.
 2021-05-24 17:55:37 +05:30
Ankush Menat
0d7f54c6c2
refactor: simplify UOM conversion logic 
- Remove unnecessary sql query
- Remove convoluted matching logic and be explcitiy while querying.
- better variable names for understanding matching cases
 2021-05-24 17:55:37 +05:30
Ankush Menat
297dc5e345
perf: add basic optimisation for uom conversion 2021-05-24 17:55:37 +05:30
Ankush Menat
958d485ba4
refactor: msgprint(raise_exception)->frappe.throw 2021-05-24 17:55:36 +05:30
Ankush Menat
ccbde0efa0
refactor: use enumerate instead of trackign index 
also removed dead code
 2021-05-24 17:55:36 +05:30
Ankush Menat
44c489223b
chore: remove py2 compat code 2021-05-24 17:55:18 +05:30
Jannat Patel
dc7afa743c
fix: profitability test (#25812) 
* fix: profitability test

* fix: replaced class method

* fix: removed print statement
 2021-05-24 17:33:48 +05:30
noahjacob
bf1b3b89d1 refactor: updated conditional visibility of check box 2021-05-24 17:03:15 +05:30
rohitwaghchaure
6809ff4f64
Merge pull request #25776 from rohitwaghchaure/fixed-warehouse-not-found-issue 
fix: warehouse not found in stock entry
 2021-05-24 17:00:06 +05:30
marination
c12264f6bc chore: Cleanup Customer and Supplier Details section in Stock Entry 
- Changed depends on value to "Send to Subcontractor" for supplier fields
- Removed Customer fields as they are not relevant to any Stock Entry purpose
- Renamed section to "Supplier Details" visibe on subcontracting transfer
 2021-05-24 13:20:22 +05:30
rohitwaghchaure
ce88c945cd
Update stock_entry.js 2021-05-24 11:53:27 +05:30
krishnagirishp
5457db0601
chore: remove uses of six.PY2 in codebase (#25062) 
* remove uses of six.py2 in codebase

* changes based on pr feedback

* Update amazon_mws_api.py

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-05-23 21:13:44 +05:30
Ankush Menat
7b4a38c71e
chore: remove print from account controller (#25807) 
This is polluting test output and it's not useful for debugging without
context.
 2021-05-23 18:49:26 +05:30
Ankush Menat
c229ac9322
refactor: add guard clause for readability 
Both functions only execute based on a condition. In such cases
condition should immediately exit the function, this is called "guard
clause" and helps in readability (less indent, and easy to "exit" when
reading the code.
 2021-05-23 16:31:29 +05:30
Ankush Menat
4b484d741d
refactor: use is_new() instead of __islocal 
Interface over implementation.
 2021-05-23 16:31:29 +05:30
Ankush Menat
931c886f92
fix: not checking all fields 
`break` will break out of the loop without checking remaining fields.
 2021-05-23 16:31:29 +05:30
Ankush Menat
83e6e2e68a
refactor: add guard clause for readability 2021-05-23 16:31:29 +05:30
Ankush Menat
0b4858d8e5
refactor: eliminate unnecessary loop, container casts 2021-05-23 16:31:29 +05:30
Ankush Menat
ad58a8164a
refactor: code cleanup 
minor fixes for improving code quality
 2021-05-23 16:31:29 +05:30
Ankush Menat
4a2dbd4885
refactor: cleanup get_timeline_data, remove py2 2021-05-23 16:31:28 +05:30
Ankush Menat
330353a5ce
refactor: use frappe.throw instread of recreating 
_msgprint was basically duplicating behvaiour of frappe.throw
 2021-05-23 16:31:16 +05:30
Marica
eaf0465c44
Merge pull request #25797 from marination/item-variants-report 
fix: Item Variant Details Report
 2021-05-22 19:05:54 +05:30
marination
b0019bcf5b fix: Item Variant Details Report 
Co-authored-by: gavindsouza <gavin18d@gmail.com>

- Handling of variants with special characters
- Set data in appropriately named columns
- Code cleanup
 2021-05-21 21:42:11 +05:30
rohitwaghchaure
ab34f5b485
Merge pull request #25742 from ankush/disable_submit_btn 
fix: duplicate stock entry on multiple click
 2021-05-21 18:13:01 +05:30
rohitwaghchaure
579a1b7028
Merge pull request #25779 from ankush/parallel_stock_transactions 
fix: wrong quantity after transaction for parallel stock transactions
 2021-05-21 18:11:34 +05:30
Saqib
0b5e340b6e
fix(pos): return case for item with available qty equal to one (#25760) 2021-05-21 16:32:56 +05:30
Saqib
e930456be2
fix(e-invoicing): 'NoneType' object is not iterable (#25781) 2021-05-21 16:31:12 +05:30
Alan
1097dc89c5
fix: show allow zero valuation only when auto checked (#25778) 2021-05-21 14:04:03 +05:30
Ankush Menat
4dcac4ae81
refactor(minor): Use identity instead of equality 
Ignore false positive.
 2021-05-21 13:49:58 +05:30
Ankush Menat
9979cf5fcc
fix: wrong quantity after transaction for parallel stock transactions 
When two transactions are inserted parallelly then previous SLE could be
incorrect for some of them. Locking SLE table would prevent reading from
it till transaction is complete.
 2021-05-21 12:31:06 +05:30
rohitwaghchaure
651e934415
Merge pull request #25683 from noahjacob/supplier_item_group_link 
feat: linking supplier with an item group for filtering items
 2021-05-21 12:07:53 +05:30
Rohit Waghchaure
795909fdcd fix: warehouse not found in stock entry 2021-05-21 11:31:01 +05:30
Anuja P
605ea044f3 fix: update process SOA format 2021-05-21 11:24:33 +05:30
rohitwaghchaure
84730aa4a5
Merge pull request #25754 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running-13 
fix: the status of repost item valuation showing In Progress since long time
 2021-05-21 09:50:18 +05:30
Rucha Mahabal
722cfdb7e5
Merge pull request #25701 from anupamvs/timesheet-refactor 
refactor: timesheet
 2021-05-20 23:43:19 +05:30
Rucha Mahabal
a7d0dbb085 fix: calculate total billing amount on fetching timesheets 
- show timesheet billing amounts in doc currency
 2021-05-20 23:02:11 +05:30
Rucha Mahabal
8a407f1ec3 fix: sider issues 2021-05-20 22:23:44 +05:30
Rucha Mahabal
be247ec3de fix: error message placeholders and sider issues 2021-05-20 22:17:20 +05:30
Rucha Mahabal
0d8b9a9d0a fix(patch): billable field not renamed 2021-05-20 19:53:30 +05:30
noahjacob
f0e6a16910 test: updated test for generated schedule dates 2021-05-20 19:29:12 +05:30
Deepesh Garg
181c5d240b
Merge pull request #25767 from deepeshgarg007/gst-ptach-fix-1 
fix: Do not throw error on migrate
 2021-05-20 18:40:48 +05:30
Mohammad Hasnain Mohsin Rajan
21e662f678
fix: apply permission while selecting projects (#25765) 2021-05-20 17:20:05 +05:30
Deepesh Garg
4427390ab3 fix: Do not throw error in migrate 2021-05-20 17:19:24 +05:30
noahjacob
0169cd845a fix: sider 2021-05-20 15:40:07 +05:30
Anupam
1270febfff fix: sider issues 2021-05-20 14:15:58 +05:30
Anupam
aa516e5d17 fix: review changes 2021-05-20 14:12:18 +05:30
Anupam
aeb88385bb patch: timesheet changes 2021-05-20 14:11:36 +05:30
noahjacob
08598238d7 refactor: suggested changes 2021-05-20 13:23:10 +05:30
Deepesh Garg
8bc90ffcf5
Merge pull request #25755 from nextchamp-saqib/improve-missing-cost-center-msg 
fix: missing cost center message on creating gl entries
 2021-05-20 11:20:43 +05:30
Saqib Ansari
b9ad385232 fix: remove uncessary query 2021-05-19 19:13:06 +05:30
Saqib Ansari
7fb385a89f fix: cannot bypass e-invoicing for non gst item invoices 2021-05-19 18:47:06 +05:30
Saqib
4bd641367b
fix: address template with upper filter throws jinja error (#25756) 2021-05-19 16:38:53 +05:30
noahjacob
516c789127 refactor: variable names and suggested changes 2021-05-19 16:01:39 +05:30
Anupam
4e73c8a79f restructuring timesheet fields 2021-05-19 14:58:12 +05:30
noahjacob
bf7f0530e6 fix: added error handling if entry already exists 2021-05-19 13:53:22 +05:30
noahjacob
8e34c49ac9 refactor: using get_all instead of get_list 2021-05-19 13:51:36 +05:30
noahjacob
3768216dca refactor: updated permissions and mandatory fields 2021-05-19 13:50:35 +05:30
Saqib Ansari
f79ef5d8cf fix: missing cost center message on creating gl entries 2021-05-19 13:04:44 +05:30
Rohit Waghchaure
5456873641 fix: run scheduler for reposting if there is no scheduler is running for the reposting 2021-05-19 12:30:28 +05:30
Anupam
9bd779401d added multi-currency fields 2021-05-18 22:41:28 +05:30
anushka19
90f7ec840c
fix: Accumulated depreciation (#25748) 
* fix: Accumulated depreciation

* fix: Sider issues
 2021-05-18 22:21:42 +05:30
Saqib
8d7d4b0ba7
fix: expected amount in pos closing payments table (#25737) 2021-05-18 18:39:35 +05:30
Syed Mujeer Hashmi
426b04003c fix: Project filter for Kanban Board 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2021-05-18 17:02:21 +05:30
Marica
814fd19424
Merge pull request #25732 from noahjacob/ux_landed_cost_voucher 
refactor: updated applicable charges form in landed cost voucher
 2021-05-18 16:39:31 +05:30
Ankush Menat
ecbb8cbc84
revert: "fix: duplicate stock entry (#25486)" 
Not required anymore, submit button is disabled.
 2021-05-18 16:35:55 +05:30
Ankush Menat
042b8524cc
fix: disable submit button to avoid multiple calls 2021-05-18 16:35:49 +05:30
Marica
5da34bddd6
Merge pull request #25731 from ankush/escaping_company_name 
fix: escape company name
 2021-05-18 16:35:19 +05:30
Devin Slauenwhite
bdba064fa6
fix: duplicate stock entry (#25486) 
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-05-18 16:12:53 +05:30
noahjacob
0ab0fcdd51 feat: added supplier item group link in supplier dashboard 2021-05-18 15:21:24 +05:30
noahjacob
ca2fb47d44 feat: updates item_code filters if item_group is linked to supplier 2021-05-18 15:01:05 +05:30
Ankush Menat
b6783b158f
chore: translation fixes 2021-05-17 17:06:41 +05:30
Ankush Menat
f3b3d81e0b
fix: escape company name in deferred_revenue 2021-05-17 17:06:41 +05:30
noahjacob
41ac8be6f2 refactor: base_amount field moved below amount field and renamed 2021-05-17 13:58:27 +05:30
Anupam
42d2f663fa fix: sider fixes 2021-05-17 11:08:26 +05:30
Deepesh Garg
87baa646e7
Merge pull request #25260 from AfshanKhan/dimension-wise-accounts-balance-reports 
feat: Dimension-wise Accounts Balance Report
 2021-05-16 18:04:01 +05:30
Anupam
35137ba9e0 removing currency filter and added rate conversion while fetching timesheets in SI 2021-05-16 14:17:56 +05:30
Anupam
cab998c293 adding patch 2021-05-15 20:40:20 +05:30
Anupam
fd4743cc31 refactor: timesheet 2021-05-15 20:01:17 +05:30
Alan
55c2fec683
feat: add pending qty section to batch/serial selector dialog (#25519) 
* feat: add pending qty section to batch/serial selector dialog

* fix: call attach in setup and refresh, fix conditional

* refactor: camel to snake casing
 2021-05-14 12:36:41 +05:30
rohitwaghchaure
2aa401826e
fix: validation message of quality inspection in purchase receipt (#25666) 2021-05-14 12:34:50 +05:30
Alan
98fc4195b3
fix: send emails on rfq submit (#25695) 
* fix: send emails on rfq submit

* fix: check if email is present for supplier
 2021-05-14 12:22:28 +05:30
Alan
eca86290bc
fix: show uom for item in selector dialog (#25697) 2021-05-14 12:21:38 +05:30
Deepesh Garg
be3cde9313
chore: Code clean up for purchase receipt GL (#25379) 
* chore: Code clean up for purchase receipt GL

* fix: add params for debit and credit in account curreny

* chore: Asset GL entry code cleanup

* fix: Syntax error

* fix: Update variable names

* fix: function naming

* fix: Add undefined variables

* fix: Supplier warehouse fetching

* fix: Linting issues
 2021-05-14 12:20:38 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes (#25249) 
* fix: RCM tax calculation

* feat(India): ITC Reversal via Journal Entry

* fix: Reverse Charge booking logic and validation

* fix: Addd patch for availed ITC fields

* fix: Hooks method to update availed ITC field

* fix: Cleanup and fixes in GSTR3B report

* fix: Update params in GSTR-1 report

* fix: Debit note using Sales Invoice

* fix: Setup and patch

* fix: GSTR 3B report cleanup and updates

* fix: Add method to get invoices liable to reverse charge

* fix: Add taxable value in Purchase Invoice Item

* fix: Inward supplies liable to reverse charge

* fix: Linting issues

* fix: GSTR3B report test
 2021-05-14 12:17:41 +05:30
rohitwaghchaure
ba940bb9e1
Merge pull request #25702 from rohitwaghchaure/change-today-to-now-for-reposting 
fix: change today to now to get data for reposting
 2021-05-13 17:44:38 +05:30
rohitwaghchaure
fc44478810
Update repost_item_valuation.py 2021-05-13 17:42:33 +05:30
Rohit Waghchaure
af1376c1df chore: change today to now to get data for reposting 2021-05-13 17:39:49 +05:30
Mohammad Hasnain Mohsin Rajan
e85770fe3f
fix: bank statement import via google sheet (#25676) 
* fix: google sheet bank statement import

* fix: quotes

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

* chore: add translation

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

* chore: grammar

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

* fix: remove comment

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-05-13 17:33:18 +05:30
rohitwaghchaure
d42dd5d868
Merge pull request #25694 from rohitwaghchaure/fixed-warehouse-tree-time-out-error-13hotfix 
fix: timeout error while loading warehouse tree
 2021-05-13 17:21:16 +05:30
Rohit Waghchaure
27f50d5852 fix: timeout error while loading warehouse tree 2021-05-13 15:54:35 +05:30
Deepesh Garg
95e05fbdac fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet 2021-05-13 14:59:28 +05:30
Anurag Mishra
0c482fde5f
feat: Leave Policy Assignment Refactor (#24327) 
* feat: Leave Policy Assignment Refactor

* fix: Changes Requested

* fix: sider

* fix: changes requested

* test: fixed

* test: fixed wrong set query

* fix: remove commented code

* fix(style): extra space

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-13 13:20:14 +05:30
rohitwaghchaure
0612300631
Merge pull request #25688 from rohitwaghchaure/fixed-woocommerce-order-sync-issue 
fix: Woocommerce order sync issue
 2021-05-12 23:07:46 +05:30
Rohit Waghchaure
c3c54fe058 fix: Woocommerce order sync issue 2021-05-12 19:42:04 +05:30
rohitwaghchaure
3c79ee3a2b
Merge pull request #25672 from rohitwaghchaure/fixed-don-not-mao-set-warehouse 
fix: don't map set warehouse from delivery note to purchase receipt
 2021-05-12 17:47:28 +05:30
Afshan
dc205e805f
fix: Dialog variable assignment after definition in POS (#25681) 2021-05-12 17:42:06 +05:30
rohitwaghchaure
4fbabb4132
Merge pull request #25679 from rohitwaghchaure/fixed-new-fields-not-added 
fix: updated modified time in purchase invoice to pull new fields
 2021-05-12 16:40:23 +05:30
Rohit Waghchaure
9f017a351b fix: updated modified time to pull new fields 2021-05-12 16:35:19 +05:30
Mohammad Hasnain Mohsin Rajan
e7a2fdd81a
fix: change links in workspace (#25674) 2021-05-12 13:02:32 +05:30
Rohit Waghchaure
d984be0ccd fix: don't map set warehouse from delivery note to purchase receipt 2021-05-12 12:32:14 +05:30
rohitwaghchaure
958c96ee3f
Merge pull request #25660 from deepeshgarg007/promotional_item_cost_center 
fix: Breaking cost center validation
 2021-05-11 18:08:17 +05:30
Deepesh Garg
a665f14620
fix: Error on adding bank account to plaid (#25658) 2021-05-11 17:33:59 +05:30
Deepesh Garg
a60c3081cf fix: Breaking cost center validation 2021-05-11 16:38:33 +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
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
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
noahjacob
50f52dfbcb refactor: variable names and refactored cancel function into submit function 2021-05-09 20:04:06 +05:30
noahjacob
7715441842 feat: added supplier item group doctype 2021-05-09 20:02:23 +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
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