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

34332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Deepesh Garg
989c853e3b
Merge pull request #24490 from deepeshgarg007/report_ltv_ratio_fix 
fix: LTV ratio in interest report
 2021-01-28 23:28:40 +05:30
Deepesh Garg
7e3f5e04ab fix: LTV ration in interest report 2021-01-28 23:25:23 +05:30
Saqib
675a8330a4
refactor: POS Invoice merging and cancellation (#24351) 
* feat: pos invoice merging with background jobs

* fix: invoice threshold for queueing job

* refactor: cancellation flow of point of sale

* feat: tests for cancellation of pos closing

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-01-28 18:42:43 +05:30
leela
3234df5581 feat: improved call log doctype 
* Added links and some more fields into Call Log Doctype
* Display call info in the call log link pages
 2021-01-28 18:34:58 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions (#24227) 
* fix: make custom fields in pos invoice similar to sales invoice

* feat: allow/disallow rate & discount change

* fix: any pos profile can be selected while creating pos opening

* fix: cannot add item to cart

* fix: validate phone payment only if payment request exists

* fix: replace pos payment method patch

* chore: rearrange item & customer group filter

* fix: allow/disallow invoice level discount

* fix: updating qty of item with uom having space char

* fix: move configuration checbox to config section

* fix: invalid item rate trigger

* fix: cannot remove item from draft invoices

* fix: customer currency not set in pos invoice

* fix: duplicate item error message

* fix: sales uom not fetched in pos invoice

* fix: cannot add taxes to pos invoice for uae region

* fix: cannot merge pos invoice into credit note

* fix: tax calculation while merging pos invoices

* feat: delete draft orders from order list

* fix: merging of pos invoice with pricing rules
 2021-01-28 17:58:55 +05:30
Anupam Kumar
0d9a8ae4d2
feat: shopping portal changes (#24445) 
* feat: shopping portal changes

* fix: review changes

* review changes
 2021-01-28 17:32:57 +05:30
Marica
26f6fa326c
Merge pull request #24451 from marination/project-naming-series-patch 
fix: Patch to Add Naming Series to old projects
 2021-01-28 14:50:25 +05:30
Marica
9580adad0c
Merge branch 'develop' into project-naming-series-patch 2021-01-28 14:32:11 +05:30
Marica
a16ad3063f
Merge pull request #24127 from deepeshgarg007/lcv_multicurrency 
feat: Multi currency in landed cost voucher
 2021-01-28 13:35:37 +05:30
Marica
7aa16bafff
Merge branch 'develop' into lcv_multicurrency 2021-01-28 13:29:36 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers (#24200) 
* fix: Item valuation for internal stocktransfers

* fix: Consider conversion factor for invoices

* fix: Add missing set warehouse fields

* fix: Add validations and other fixes

* fix: Fixes in flow

* fix: Internal sales item link in Purchase Invoice

* fix: Debugging

* fix: Debug travis

* fix: Remove commented code

* fix: Rate forcing in sales order

* fix: Unreallized profit in Sales Register

* fix: Item wise gst sales register fix

* fix: From warehouse in Purchase Order

* fix: Target field in Sales Invoice

* fix: remove self

* fix: GST Purchasse register and other fixes

* fix: Add shipping_address to no field map

* fix: Ref doc map

* fix: Test Cases

* fix: address mapping between sales and purchase document

* fix: Import Error

* fix: Tax updation for internal invoices

* fix: Purchase Order and Invoice linking

* fix: Internal Party validation fix

* fix: validation

* fix(india): GST Taxes for intra state transfer

* fix(india): GST Taxes for intra state transfer

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 13:09:56 +05:30
Marica
465974cff0
Merge branch 'develop' into project-naming-series-patch 2021-01-28 13:01:28 +05:30
Marica
ed6368d782
Merge pull request #24481 from marination/stock-entry-indicator 
chore: Set Stock Entry Form Indicators in setup
 2021-01-28 13:00:24 +05:30
Marica
9e11521764
Merge pull request #24466 from marination/stock-entry-qi 
fix: Always show QI Template in Item
 2021-01-28 12:45:49 +05:30
Mohamed Almubarak
f7ea340181
fix(template): cards on second row overlaps the one before (#23454) 
* Update macros.html

fix second row of cards overlapps with the one before

* Update macros.html

fix(template): second row of cards overlaps with the one before

* Update macros.html

fix(template): second row of cards overlaps with the one before
 2021-01-28 12:32:13 +05:30
Jannat Patel
9f8cbe9101
Material request wrong status issue (#24019) 
* fix: material request status fix

* fix: changing precision to global defaults for material request status

* fix: adding back the removed flt

* fix: sider issues fixed

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2021-01-28 12:29:52 +05:30
Saqib
8e55677f10
feat: deleting account & stock entries on deletion of transaction (#24298) 
* feat: control for deleting account & stock entries on deletion of a transaction

* chore: change label & fieldname

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 12:26:45 +05:30
Jannat Patel
3914aca647
fix: check for tax rate (#24376) 2021-01-28 12:25:15 +05:30
Anurag Mishra
5756bf50e6
fix: removed all day event from shift assignment calendar (#24397) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-01-28 12:24:39 +05:30
Afshan
e5529ad461
fix: validate tax template for tax category (#24402) 
* fix: validate tax template for tax category

* Update sales_taxes_and_charges_template.py
 2021-01-28 12:22:39 +05:30
Raffael Meyer
f6f4376463
feat: remove german sales invoice validation (#24441) 
This can be better achieved via Customize Form
(mandatory and mandatory_depends_on)
 2021-01-28 12:16:26 +05:30
Marica
cc22814df5
Merge branch 'develop' into lcv_multicurrency 2021-01-28 12:15:09 +05:30
Marica
cdccf4be52
Merge branch 'develop' into stock-entry-qi 2021-01-28 12:12:03 +05:30
Deepesh Garg
16bcd01f6d
feat: Provision to disable serial no and batch selector (#24398) 
* feat: feat: Provision to disbale serial no and batch selector

* fix: Sider issues

* fix: Linting issues
 2021-01-28 12:09:35 +05:30
Deepesh Garg
bd9bdc5797
feat: Batch wise item pricing (#24470) 
* feat: Batch wise item pricing

* fix: Rate for items with no batch

* fix: Add test case for batch pricing

* fix: Sider Issues

* fix: Add item filter for batch
 2021-01-28 12:05:57 +05:30
marination
27bac2aaec fix: Missing semi-colon 2021-01-28 12:04:14 +05:30
marination
bc370b3ee5 chore: Set Stock Entry Form Indicators in setup 
- Makes it easier to override via customisations
- Style consistency with other forms that set indicator in setup as well
 2021-01-28 11:44:26 +05:30
Marica
ea7c2dbfaf
Merge branch 'develop' into stock-entry-qi 2021-01-28 11:31:43 +05:30
prssanna
74feaf85dc fix: website order page style 2021-01-27 17:41:15 +05:30
Afshan
907e2990d0
fix: remove function to get earning deduction components (#24465) 
* fix: remove function to get earning deduction components

* fix: slider
 2021-01-27 15:34:42 +05:30
Saqib
5ba2f58355
fix: e_invoice print format not showing other charges (#24474) 2021-01-27 12:34:08 +05:30
prssanna
2d1d900c88 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-27 10:58:17 +05:30
prssanna
72053cc4ab fix: cart address overflow 2021-01-27 10:57:34 +05:30
Deepesh Garg
dade7a4583 fix: Translation Syntax 2021-01-26 21:11:55 +05:30
Deepesh Garg
a0d61524c1 fix: Add distribute manually option in LCV 2021-01-26 17:05:00 +05:30
Deepesh Garg
ff3adfd1cf
Merge pull request #24468 from deepeshgarg007/lse_report_fix 
fix: Division by 0 error in security exposure reports
 2021-01-26 10:13:39 +05:30
Deepesh Garg
7a4db2214a fix: Division by 0 error in security exposure reports 2021-01-26 10:10:35 +05:30
Deepesh Garg
224fdf34e4 Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2021-01-25 22:16:02 +05:30
Raffael Meyer
1991ba7910
feat: temporary against account (#24086) 
* feat: add temporaray against account nmber to datev settings

* feat: use temporary against account in datev report

* test: add temp against account number to test data

* test: include temp against aaccount in filters
 2021-01-25 21:22:10 +05:30
Marica
35455d2de6
Merge branch 'develop' into project-naming-series-patch 2021-01-25 21:16:02 +05:30
marination
b0ef8fb7c5 fix: Always show QI Template in Item 2021-01-25 21:00:24 +05:30
rohitwaghchaure
fa3ec3c346
Merge pull request #23969 from marination/putaway 
feat: Putaway
 2021-01-25 16:42:04 +05:30
Marica
62a1caf6c4
Merge branch 'develop' into lcv_multicurrency 2021-01-25 12:39:16 +05:30
Marica
ec4f42d4a9
Merge branch 'develop' into project-naming-series-patch 2021-01-25 11:29:23 +05:30
Deepesh Garg
164079127f
Merge pull request #24446 from deepeshgarg007/patch-fix-1-new 
fix: Project Template patch
 2021-01-25 10:37:43 +05:30
Deepesh Garg
befe32cbe1
Merge pull request #24456 from deepeshgarg007/ltv_in_report 
fix: Add loan to value field in Loan Interest Report
 2021-01-24 19:18:42 +05:30
Deepesh Garg
91eb9bb5c2 fix: Add loan to value field in Loan Interest Report 2021-01-24 19:15:57 +05:30
Kaviya Periyasamy
c680547be3
fix(einvoice): QRCode generation (#24412) 2021-01-24 10:59:37 +05:30
rohitwaghchaure
13df7a0ca6
Merge pull request #24033 from ruchamahabal/patient-history-enhancements 
feat: Patient History Enhancements
 2021-01-23 18:19:16 +05:30