Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,251 Commits 3 Branches 0 Tags 1 GiB
2e1787300d
Commit Graph

24221 Commits

Author SHA1 Message Date
Mangesh-Khairnar
5c29eb08c4 Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-10-19 18:29:46 +05:30
Mangesh-Khairnar
ebb8ee3dc6 fix(payment gateway account): add patch to set the payment channel as email 2020-10-19 18:27:40 +05:30
Mohammad Hasnain
32eb9a7893 feat(UAE VAT 201): claimable to recoverable 2020-10-19 17:58:50 +05:30
Joseph Marie Alba
8115be58a3
fix: Posting Date bug in load_defaults (#23415) 
this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date

The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored.
Example: (Assuming posting date has been included in standard filter)
```
frappe.ui.form.on('Journal Entry', {
	before_load(frm) {
	    var posting_date = $("input[data-fieldname='posting_date']")[0].value
	    posting_date = moment(posting_date)._d
	    frm.set_value('posting_date', posting_date )
	}
})
```

Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored.

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-10-19 17:02:04 +05:30
Rucha Mahabal
174019a838
fix: Student Admission and Student Applicant fixes (#23515) 
* fix: student admission list portal styling

* fix: added basic validations to Student Admission DocType

* fix: show program description and apply button for every program

* fix: don't show apply now button if admissions have not started

* fix: fetch admission details in student applicant web form

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 17:00:56 +05:30
Deepesh Garg
8859b71956
fix: Check for backdated validation only for transaction company (#23639) 
* fix: Check SLE only for transaction company

* fix: Add tests

* fix: Move backdated entry validation from transaction base to stock ledger entry

* chore: Add tests

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 16:56:45 +05:30
Afshan
e0cb6c3b9d
fix: removed extra space from label "Rate" (#23683) 2020-10-19 16:55:20 +05:30
rohitwaghchaure
3a17147a32
refactor: book loss amount in the COGS instead of stock received but not billed (#23671) 2020-10-19 16:54:11 +05:30
Glen Whitney
f5a8dc0f9c
fix(Bank Reconciliation): update/merge CR/DR journal entry search (#23629) 
* fix(Bank Reconciliation): update/merge CR/DR journal entry search

  Prior to this commit, the debit journal entry search (for
  credit-side Bank Transaction entries) and the corresponding
  credit journal entry search had diverged, with the latter
  working but the former not working. Thus, the search for
  journal entries matching a credit Bank Transaction (for the
  purposes of reconciliation) was never returning any matching
  journal entries, making reconciliation difficult.

  To fix this, this commit not only updates the debit journal
  entry search, but takes advantage of the fact that the two SQL
  queries for the two sides (debit/credit) differ only by the
  word "debit" or "credit," to merge the code for the two
  queries, making the code more DRY and hopefully reducing the
  chance of similar bugs occurring in the future.

* fix: message translation

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 16:49:55 +05:30
Saqib
896a0cc1f7
Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-19 11:55:12 +05:30
rohitwaghchaure
2fbeb7c1dd
refactor: added new filters in the Batch-wise balance history report (#23676) 
* refactor: added new filters in the Batch-wise balance history report

* fix: added semicolon

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:37:54 +05:30
Frappe PR Bot
083f3fd981
chore: Update translations (#23677) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:19:27 +05:30
Rucha Mahabal
96bd65e203
fix: duplicate validation for Course Enrollment (#23659) 
* fix: duplicate validation for Course Enrollment

* fix: clean-up failing tests
 2020-10-19 10:41:25 +05:30
rohitwaghchaure
5d6686bd8c
Fixed stock ageing report data develop (#23673) 
* fix: stock ageing report

* Update stock_ageing.py
 2020-10-19 10:39:20 +05:30
rohitwaghchaure
21bf5e9b8e
Fixed incorrect operation time calculation develop (#23674) 
* fix: incorrect operation time calculation for batch size

* Update test_work_order.py
 2020-10-19 10:38:48 +05:30
Rucha Mahabal
c3b1aef9f9
fix(minor): msgprint not defined in POS Invoice (#23680) 
* fix(minor): msgprint not defined in POS Invoice

* fix: translation friendly syntax
 2020-10-18 19:28:26 +05:30
Faris Ansari
c6f4e84a45
Merge pull request #23640 from abhishekbalam/address_customisation 2020-10-16 18:21:09 +05:30
Marica
569e218aa0
Merge pull request #23666 from marination/payment-reco-mandatory-check 
fix: Payment Reconciliation client side validations
 2020-10-16 18:06:16 +05:30
Rohit Waghchaure
e6a29cc33a fix: performance issue while adding template item in the cart 2020-10-16 17:59:54 +05:30
Rohit Waghchaure
76fafe8842 feat: balance serial nos in stock leder report 2020-10-16 17:58:54 +05:30
rohitwaghchaure
e30397bf2e
Merge pull request #23668 from rohitwaghchaure/incorrect-work-order-qty-againt-production-plan-develop 
fix: production plan incorrect work order qty (#23264)
 2020-10-16 17:41:25 +05:30
rohitwaghchaure
6646c524e6
Merge pull request #23670 from rohitwaghchaure/enabled-no-copy-for-bill-date-devlop 
refactor: enabled no copy property for Supplier Invoice Date to due date validation
 2020-10-16 16:45:56 +05:30
rohitwaghchaure
4eaa74c4f5
Merge pull request #23669 from rohitwaghchaure/not-able-to-make-material-request-from-so-develop 
fix: not able to make material request from SO
 2020-10-16 16:43:45 +05:30
Marica
3f7333af7f
Merge branch 'develop' into payment-reco-mandatory-check 2020-10-16 16:03:59 +05:30
marination
b14ffc4349 fix: Missing semicolon 2020-10-16 16:04:56 +05:30
Faris Ansari
be0fcbea68 fix: Dont add Contact link if is company address 2020-10-16 15:55:25 +05:30
Faris Ansari
22bcad9dc7 fix: Cleanup code 2020-10-16 15:28:12 +05:30
Rohit Waghchaure
3cdaa92582 refactor: enabled no copy property for Supplier Invoice Date to avoid due date validation 2020-10-16 15:26:27 +05:30
Rohit Waghchaure
2ce67b0ef9 fix: not able to make material request from SO 2020-10-16 15:21:52 +05:30
rohitwaghchaure
f01856d7a9 fix: production plan incorrect work order qty (#23264) 
* fix: production plan incorrect work order qty

* added test case

* Update test_production_plan.py
 2020-10-16 15:19:23 +05:30
marination
e9b04dc727 fix: Payment Reconciliation client side validations 2020-10-16 12:36:13 +05:30
Saqib
2f71927af8
fix: fuel expense amount of vehicle log (#23632) 
* fix: fuel expense amount of vehicle log

* fix: undefined var employee_id in test

* fix: test
 2020-10-16 12:32:59 +05:30
Mangesh-Khairnar
c66fce4965 fix: reload current pos doc after updating the information via callback 2020-10-16 12:03:08 +05:30
Mangesh-Khairnar
cab5d22ef5 fix: add a realtime publish to refresh the dashboard content 2020-10-16 11:38:07 +05:30
Saqib Ansari
de505631a6 fix: codacy 2020-10-16 11:30:34 +05:30
Saqib Ansari
1dec68e8e4 fix: transalation syntax 2020-10-16 10:47:29 +05:30
Deepesh Garg
775e689ba9 fix: Add tests 2020-10-15 22:09:05 +05:30
Deepesh Garg
01a7297f69 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor 2020-10-15 17:13:29 +05:30
Rohit Waghchaure
5f465394a7 fix: serial no field is blank in stock reconciliation 2020-10-15 15:56:50 +05:30
rohitwaghchaure
79c1c4e3fb
Merge pull request #23398 from anupamvs/quality-procedure-v13 
fix: quality procedure parent
 2020-10-15 15:52:22 +05:30
Abhishek Balam
349fcfd6a5 fix: set default filters on unchecking box, code cleanup 2020-10-15 12:21:43 +05:30
Wolfram Schmidt
3959ed5bef
Update payment_term.json (#23644) 
added descriptions to fields to clarify input.
 2020-10-14 22:48:46 +05:30
Deepesh Garg
ddccec4f5d
Merge pull request #23643 from deepeshgarg007/payment_reco_cancel 
fix: Do not get cancelled vouchers in Payment Reconciliation
 2020-10-14 22:09:08 +05:30
Deepesh Garg
37c2ed269e fix: Do not get cancelled vouchers in Payment Reconciliation 2020-10-14 21:47:43 +05:30
Abhishek Balam
89419c9a30 fix: move get_shipping_address() from frappe to erpnext and fix references 2020-10-14 20:09:05 +05:30
Abhishek Balam
2f528c1c73 fix: gettext import and changed function order in address.py 2020-10-14 19:48:57 +05:30
Abhishek Balam
c0215d257c
Merge branch 'develop' into address_customisation 2020-10-14 19:33:16 +05:30
Abhishek Balam
6e9e7b4c7a fix: serverside validation overrides 2020-10-14 19:31:37 +05:30
Abhishek Balam
38b26c8f3e fix: added semicolons 2020-10-14 18:24:51 +05:30
rohitwaghchaure
f8ce64c0ca
Merge pull request #23443 from marination/rfq-email 
feat: Supplier Email Preview in RFQ
 2020-10-14 18:16:59 +05:30
Abhishek Balam
346ca568b7 fix: set company link in address when is_your_company_address is set 2020-10-14 18:11:04 +05:30
Mohammad Hasnain
b9dc13294d chore(UAE VAT 201) solve translations issues 2020-10-14 16:56:26 +05:30
Nabin Hait
a2d6f254c5
Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-14 16:34:56 +05:30
Afshan
9e08b21e0b
fix: removing unused imports (#23633) 2020-10-14 15:44:52 +05:30
Saqib
577a7fe01d
fix: stock & account balance difference in fraction (#23635) 2020-10-14 15:44:30 +05:30
Mohammad Hasnain
dfc3993cec chore(UAE VAT 21): rename report 2020-10-14 12:21:36 +05:30
Raffael Meyer
d1863e6f9e
fix: Chart of Accounts (#23530) 
* fix: Chart of Accounts

* fix: Chart of Accounts with lower case "of"

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-14 10:29:53 +05:30
Anupam Kumar
31417864cb
fix: project value is missing from procurement-tracker (#23549) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-14 10:29:25 +05:30
Frappe PR Bot
d8ddc321f8
chore: Update translations (#23577) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-14 10:28:21 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d Merge branch 'develop' into UAE-VAT-Format 2020-10-14 00:26:57 +05:30
rohitwaghchaure
cb791330f6
Merge branch 'develop' into quality-procedure-v13 2020-10-13 23:39:45 +05:30
Rucha Mahabal
f625da2b8b
Merge branch 'develop' into enrollment-fixes 2020-10-13 23:24:42 +05:30
rohitwaghchaure
4d93bfebd8
Merge pull request #23622 from AfshanKhan/fix-billing-summary-report-precision 
fix: setting user defined precision instead of 2
 2020-10-13 22:46:02 +05:30
Rucha Mahabal
ff0917358c fix: test 2020-10-13 22:39:05 +05:30
Saqib
639eea142f
Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-13 21:42:22 +05:30
Deepesh Garg
8a7886ac60
Merge pull request #23621 from frappe/address_template_luxembourg 
feat: add address template for luxembourg
 2020-10-13 21:31:51 +05:30
Deepesh Garg
71a58a8fd0
Merge pull request #23605 from marination/item-link-formatter 
fix: Item Link Formatter Behaviour
 2020-10-13 21:26:00 +05:30
Sun Howwrongbum
93da52941e
fix: consider rounded_total in returns (#23609) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-13 21:23:26 +05:30
Deepesh Garg
06268e5f57
Merge pull request #23623 from kennethsequeira/italy-fy 
fix: Fiscal Year and Tax Rates for Italy
 2020-10-13 20:29:51 +05:30
rohitwaghchaure
db0fefd92c
Merge pull request #23614 from aakvatech/patch-3 
feat: Add company and correct filter in bank reconciliation statement
 2020-10-13 19:59:31 +05:30
rohitwaghchaure
2a8a2215d0
Merge pull request #23620 from anupamvs/lead-address 
fix: displaying mandatory address field in Lead form
 2020-10-13 19:54:44 +05:30
Kenneth Sequeira
3eec4e61ab fix: GST rates for Australia 2020-10-13 19:23:48 +05:30
Kenneth Sequeira
1b329aaa7b fix: json format fixes 2020-10-13 19:10:09 +05:30
Afshan
c359d3528f fix: setting user precision instead of default 2020-10-13 18:54:54 +05:30
Anupam
7db38058f3 fix: displayings mandatory address field in Lead form 2020-10-13 17:33:58 +05:30
Rucha Mahabal
fc8ced9958
Merge branch 'develop' into enrollment-fixes 2020-10-13 17:28:39 +05:30
Mangesh-Khairnar
51228b5ee3 fix: make response handling more descriptive 2020-10-13 17:10:16 +05:30
barredterra
9aa3e7a37d feat: address template for luxembourg 2020-10-13 13:35:33 +02:00
Marica
43d3176d62
Merge branch 'develop' into patch-3 2020-10-13 17:01:18 +05:30
Marica
0ed3e947ba
Merge branch 'develop' into rfq-email 2020-10-13 16:55:25 +05:30
Marica
9cd79b6859
Merge branch 'develop' into item-link-formatter 2020-10-13 16:54:28 +05:30
Marica
c5e139a542
fix: Travis (#23606) 
* fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places

* fix: Item Barcode and Test

* fix: Over Receipt on subcontracting test

* fix: POS Invoice and Loyalty Program Tests

* fix: POS serialized item test and subcontracting exploded items in PO

* fix: Subcontracting test considering sourced_by_supplier items

* fix: Make only one Additonal Salary List with overwrite set
 2020-10-13 16:53:10 +05:30
Anupam
3245eaaeb0 fix: displayings mandatory address field in Lead form 2020-10-13 15:35:10 +05:30
Marica
ae1c65cde7
Merge branch 'develop' into item-link-formatter 2020-10-13 15:05:53 +05:30
Anupam
528a75ae9b fix: review changes 2020-10-13 11:46:52 +05:30
justmejust
ed779a416c
Update ar.csv (#23490) 
these changes made to the file is critical and important for Arabic user of the this software .the changes made to make appropriate and more correct meaning fro example in the Blanket Orders from Costumers the previous translation meaning امر بطانية) ) which mean you have an order to get ta Blanket which used when  you want to sleep.
so i decided to make this changes and will continue update this translation file in the future.
 2020-10-13 11:46:02 +05:30
aakvatech
617892db20
feat: Add company and correct filter in bank statement reconciliation report filters 
If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created.

https://github.com/frappe/erpnext/issues/23613
 2020-10-13 08:18:59 +03:00
marination
5b790a0095 fix: Convert dates to datetime.date before comparing in Holiday List 2020-10-13 02:37:55 +05:30
Kenneth Sequeira
968f61d8ba fix: add multiple VAT rates for Italy 2020-10-13 00:25:46 +05:30
Kenneth Sequeira
56d305b966 fix: update italy fiscal year 2020-10-13 00:07:52 +05:30
marination
824f48fd23 fix: Item Link Formatter Behaviour 2020-10-12 20:08:03 +05:30
Anupam Kumar
71c02a6e89
Merge branch 'develop' into subscription-invoice-issue 2020-10-12 19:41:31 +05:30
Raffael Meyer
0975b961f9
Merge branch 'develop' into validate_regional_germany 2020-10-12 15:08:58 +02:00
Saqib
3daad224ad
fix: cannot merge pos invoice if validate selling price is checked (#23593) 
* fix: cannot merge pos invoice if validate selling price is checked

* fix: validate selling price

* fix: test

* chore: add test

* fix: error message
 2020-10-12 18:31:23 +05:30
Marica
9cc05bb83e
Merge branch 'develop' into rfq-email 2020-10-12 18:02:15 +05:30
rohitwaghchaure
4164d08d17
Merge pull request #23323 from marination/supplier-quotn-comparison 
feat: Supplier Quotation Comparison - v3
 2020-10-12 17:55:15 +05:30
Marica
41067e204c
Merge branch 'develop' into print-uom-after-quantity-patch 2020-10-12 17:32:29 +05:30
Marica
6d935d4e48
Merge branch 'develop' into company-issue 2020-10-12 17:25:12 +05:30
Marica
14b9c79ddc
Merge branch 'develop' into supplier-quotation-ux 2020-10-12 17:16:28 +05:30
Saqib
b332c5f06f
fix: sales invoice series gets overwritten with pos invoice series (#23479) 
* fix: sales invoice series gets overwritten with pos invoice series

* chore: show is consolidated only if sales invoice is pos
 2020-10-12 17:10:37 +05:30
Saqib
ebb0a6266a
fix: last purchase rate in item prices report (#23506) 
* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* chore: fetch last purchase rate from update stock purchase invoices
 2020-10-12 17:09:09 +05:30
Saqib
ebbe285872
feat: (report) POS Register (#23313) 
* feat: pos register report

* feat: group by fields in pos register

* chore: add paid amount column

* fix: (minor) remove redundant group by label
 2020-10-12 17:02:31 +05:30
rohitwaghchaure
a060f8c00b
Merge pull request #23524 from michellealva/employee_exit 
fix(Employee): Field level change in Exit section
 2020-10-12 16:23:54 +05:30
rohitwaghchaure
14e7656a57
Merge pull request #23588 from kevingdc/fix/asset-update-maintenance-status 
fix: Asset status after maintenance or repair
 2020-10-12 16:13:29 +05:30
Marica
e9f0268d32
Merge branch 'develop' into item-attribute-validation-on-non-template-item 2020-10-12 15:26:34 +05:30
rohitwaghchaure
a57ad47cb8
Merge pull request #23538 from kennethsequeira/spellcheck 
chore: spell fixes for Condition
 2020-10-12 15:25:23 +05:30
Marica
aeba75cd08
Merge branch 'develop' into mr-ux 2020-10-12 15:17:32 +05:30
rohitwaghchaure
4e59abf0bf
Merge pull request #23583 from anupamvs/item-price 
fix: can't save item price after adding child table
 2020-10-12 15:15:50 +05:30
Rushabh Mehta
2bef986f14
Merge pull request #23450 from michellealva/jc 
fix: Change Error Message in Work Order
 2020-10-12 15:07:21 +05:30
Glen Whitney
6ec3dc5453
fix(asset): cannot create asset if cwip disabled and account not set (#23580) 
* Never add an asset GL entry if CWIP is not enabled

* fix: asset purchase with purchase invoice

* chore: allow enable cwip accounting only if cwip account is set

* fix: cannot create asset if cwip disabled and account not set

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2020-10-12 14:56:55 +05:30
Deepesh Garg
15d46040ff
fix: Do not consider opening entries for TDS calculation (#23597) 2020-10-12 12:39:08 +05:30
Anupam
efc3e1fa62 fix: Payment Schedule not fetching 2020-10-12 12:15:49 +05:30
marination
03975a692e fix: Perform Item Attribute Value Validation on Variants Only 2020-10-12 12:03:07 +05:30
Kevin Chan
7a86a77322 fix: Asset status after maintenance or repair 
Fix a bug where an **Asset**'s status is not being set to what it was
previously after an **Asset Repair** or **Asset Maintenance**.
 2020-10-12 11:30:36 +08:00
Deepesh Garg
c9ebef4d30
Merge pull request #23567 from nextchamp-saqib/restrict-future-posting 
chore: do not allow future transactions
 2020-10-11 20:55:38 +05:30
Anupam
2be23309bb fix: can't add child table in item price 2020-10-11 14:14:50 +05:30
Mohammad Hasnain
ac451b3a54 feat(UAE VAT 21): Move standard rated expense from Sales invoice to Purchase invoice 2020-10-11 01:40:22 +05:30
Mohammad Hasnain
fc2ace1a31 Merge branch 'develop' into UAE-VAT-Format 2020-10-10 22:06:06 +05:30
Mohammad Hasnain
72bcb56368 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-10-10 22:04:16 +05:30
Saqib Ansari
3d91d48b77 fix: validate only for stock transactions 2020-10-10 21:56:50 +05:30
rohitwaghchaure
ad9db89514
Merge pull request #23573 from deepeshgarg007/opening_jv 
fix: Opening Journal Entry via Data Import
 2020-10-10 13:16:41 +05:30
Deepesh Garg
e9c1098f5f
Merge pull request #23566 from michellealva/sales_team 
fix: Change name of Sales Team table
 2020-10-10 12:14:00 +05:30
rohitwaghchaure
1bcd84450c
Merge pull request #23560 from deepeshgarg007/regional_doctypes_desk 
fix: Add lower deduction certificate in desk page
 2020-10-10 11:23:26 +05:30
rohitwaghchaure
01e23264a6
Merge pull request #23557 from KanchanChauhan/issue#23475-2 
feat: Supplier Sourced Items in BOM
 2020-10-10 11:17:53 +05:30
rohitwaghchaure
5065f8ac83
Merge pull request #23545 from tundebabzy/develop 
fix: pass self.flags.ignore_permissions to the ignore_permissions
 2020-10-10 11:11:57 +05:30
rohitwaghchaure
04ddf24ffe
Merge pull request #23572 from marination/payment-entry-list-view 
fix: Check if list view standard filter exists in Payment Entry
 2020-10-10 11:09:31 +05:30
rohitwaghchaure
9333a1dd54
Merge pull request #23570 from nextchamp-saqib/si-dashboard-fix 
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
 2020-10-10 11:08:37 +05:30
rohitwaghchaure
ea8ea4abb5
Merge pull request #23569 from marination/prod-order-reference-in-item 
fix: Remove Production Order reference from Item Validation
 2020-10-10 11:03:26 +05:30
Kanchan Chauhan
654c36ea99 feat: Supplier Sourced Items in BOM 2020-10-09 22:05:03 +05:30
Deepesh Garg
2676f96203 fix: Opening Journal Entry via Data Import 2020-10-09 21:58:38 +05:30
marination
07731c7735 fix: Check if list view standard filter exists in Payment Entry 2020-10-09 21:44:23 +05:30
Saqib
56fea7d243
fix: update items after submission ignores precision (#23491) 
* fix: update items after submission ignores precision

* chore: add test
 2020-10-09 21:19:25 +05:30
Saqib Ansari
d927c8efba fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard 2020-10-09 21:00:33 +05:30
marination
bd6d5eb5ac fix: Remove Production Order reference from Item Validation 2020-10-09 20:57:17 +05:30
michellealva
1bc7fc41a5 fix: Change name of Sales Team table 2020-10-09 16:01:13 +05:30
Saqib Ansari
776d8f72cf chore: do not allow future transactions 2020-10-09 15:36:11 +05:30
Anupam
22dc42efb9 fix: error log while creating company 2020-10-09 14:58:39 +05:30
Tunde Akinyanmi
f2b12a3b9c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-10-09 07:20:19 +01:00
Rucha Mahabal
a6dc7833f6
Merge pull request #23537 from michellealva/missing_links 
fix: Add links in Stock desk page
 2020-10-09 11:46:14 +05:30
Deepesh Garg
5e6ea36938 fix: Add lower deduction certificate in desk page 2020-10-08 20:32:36 +05:30
Rohit Waghchaure
a86cab0bb2 fix: added patch to make custom field 'Print UOM after Quantity' 2020-10-08 16:41:23 +05:30
Deepesh Garg
c837b5f48c
Merge pull request #23014 from abhishekbalam/pricing_rule_on_condition 
feat(Accounts): Add Condition Field In Pricing Rule
 2020-10-08 16:32:21 +05:30
Abhishek Balam
6d1af84fef
Merge branch 'develop' into budget 2020-10-08 16:23:36 +05:30
Deepesh Garg
8242da6310 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor 2020-10-08 16:23:34 +05:30
Saqib Ansari
3f28fb19aa chore: validate is_group of child parent account before auto creating an account 2020-10-08 14:57:27 +05:30
rohitwaghchaure
242bae4a81
Merge pull request #23548 from michellealva/selling_links 
fix(Selling): Add missing reports on desk
 2020-10-08 11:24:46 +05:30
Saqib
22b4c86a38
fix: cannot merge pos invoices with inclusive tax (#23541) 
* fix: cannot merge pos invoices with inclusive tax

* fix: item rate calculation
 2020-10-08 11:23:21 +05:30
michellealva
38aee6e3cb fix(Selling): Add missing reports on desk 2020-10-08 10:24:11 +05:30
Tunde Akinyanmi
4010196488 fix: pass self.flags.ignore_permissions to the ignore_permissions 
argument of Address and Contact controller
 2020-10-08 02:25:09 +01:00
Kenneth Sequeira
0b84a6399b fix: remove default nationality as Indian 2020-10-07 23:14:27 +05:30
Kenneth Sequeira
be0ebc5085 spell fixes for Condition 2020-10-07 20:47:12 +05:30
Marica
71db253b86
Merge branch 'develop' into fix_title_customer_name 2020-10-07 20:27:32 +05:30
Abhishek Balam
ebf53a7f25
fix(HR): Appraisal form Enhancements (#23500) 
* fix: remove total score button

* Removing conflicts
 2020-10-07 19:59:26 +05:30
michellealva
3525ddabc5 fix: Add links in Stock desk page 2020-10-07 19:02:19 +05:30
barredterra
242579b77c fix: use party name as title 2020-10-07 14:34:21 +02:00
michellealva
a9c2401a2d fix: Typo in Accounts Setings 2020-10-07 15:13:57 +05:30
Abhishek Balam
937308854a
Merge branch 'develop' into pricing_rule_on_condition 2020-10-07 13:35:53 +05:30
Raffael Meyer
2acfc2a034
Merge branch 'develop' into validate_regional_germany 2020-10-06 16:53:52 +02:00
michellealva
203585f292 fix(Employee): Field level change in Exit section 2020-10-06 16:00:39 +05:30
michellealva
2e425efae8 fix: blank option in the beginning 2020-10-06 15:15:29 +05:30
michellealva
a2aae5644e fix(Budget): Change options in select field 2020-10-06 15:02:01 +05:30
Mangesh-Khairnar
faa0cce7a7 fix: pass mobile number to generate the stk push 2020-10-06 13:58:54 +05:30
Deepesh Garg
f183dd6d3a
Merge branch 'develop' into tax_fetch_quote 2020-10-06 13:27:28 +05:30
rohitwaghchaure
59ee417d31
Merge pull request #23483 from marination/item-attr 
fix: Handle Blank from/to range in Numeric Item Attribute
 2020-10-06 12:00:26 +05:30
Mangesh-Khairnar
862433febb fix: create custom field for mpesa receipt 2020-10-06 10:59:59 +05:30
Mangesh-Khairnar
8d54d61c28 fix: handle payment completion via payment request 2020-10-05 22:37:31 +05:30
Sun Howwrongbum
72a596971c
fix: also update employee field when renamed (#23482) 2020-10-05 20:48:53 +05:30
Deepesh Garg
f58a5ec6a5 fix: Codition in batch selector query 2020-10-05 13:55:53 +05:30
rohitwaghchaure
96fadb7c9b
Merge pull request #23511 from marination/sales-order-project 
fix: Show Project under Create button in SO
 2020-10-05 13:17:48 +05:30
rohitwaghchaure
ad2dd6062e
Merge pull request #23513 from deepeshgarg007/batch_search 
fix: Search batches based on search fields
 2020-10-05 13:16:03 +05:30
Deepesh Garg
1fae7749be fix: Search batches based on search fields 2020-10-05 12:38:54 +05:30
marination
e7af9ff999 fix: Show Project under Create button in SO 2020-10-05 12:24:43 +05:30
Saqib
2016a34e30
fix: naming series - cannot reset current value to zero (#23504) 2020-10-04 18:13:24 +05:30
Deepesh Garg
5bf35e465e
Merge pull request #23220 from marination/account-add-rename 
feat: Validate and Update Child Company Accounts on Rename/Adding Account
 2020-10-04 15:19:26 +05:30
Mangesh-Khairnar
1bef6a530c fix: create payment entry against payment request 2020-10-04 13:01:11 +05:30
Deepesh Garg
f8bf139692
Merge pull request #23498 from aakvatech/patch-3 
fix: get_outstanding_invoices not ignoring the cancelled transactions
 2020-10-03 22:36:24 +05:30
aakvatech
38ccf82604
fix: get_outstanding_invoices not ignoring the cancelled transactions 
Added is_cancelled=0 in 2 places for get_outstanding_invoices
 2020-10-03 19:41:38 +03:00
Suraj Shetty
5dc0432cff chore: Update translations 2020-10-03 08:52:07 +00:00
rohitwaghchaure
3c77a4697b
Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report 
fix: currency symbol in profit and loss report
 2020-10-03 10:32:00 +05:30
marination
c213cd96c5 fix: Handle Blank from/to range in Numeric Item Attribute 2020-10-02 12:22:28 +05:30
marination
0bc61b31f7 chore: Move Qty fields (received qty,etc.) close to Qty/Stock UOM 2020-10-02 11:54:54 +05:30
Suraj Shetty
70c06512d2 chore: Update translations 2020-10-02 03:57:15 +00:00
marination
b9e2f17f4f fix: More secure query 2020-10-01 21:31:51 +05:30
marination
f57ba86bce chore: Add Date and Valid Till to List View 2020-10-01 21:10:00 +05:30
marination
5006345a0a chore: Fetch RFQs in Get Items from RFQ based on Supplier selected 
- Rfq will appear only if selected supplier is in the RFQ
 2020-10-01 20:41:05 +05:30
marination
4993ef19d6 feat: Supplier Quotation UX fixes 2020-10-01 16:35:09 +05:30
marination
29d7528a95 fix: Hide Preview Email button on submitted doc 2020-10-01 14:55:21 +05:30
Abhishek Balam
71c24c8a90 feat: add tests 2020-10-01 14:54:11 +05:30
marination
f90c3602a7 fix: Price should be total amount, modified deskpage 2020-10-01 14:38:17 +05:30
hasnain2808
f8db9582c3 feat(UAE VAT 21): Add currency formatting 2020-10-01 12:59:39 +05:30
hasnain2808
8cc6f2b388 feat(UAE VAT 21): add fixed width to columns 2020-10-01 12:44:39 +05:30
hasnain2808
10a3a338b6 refactor: change uae vat settingplural 2020-09-30 21:51:00 +05:30
Faris Ansari
db8764a520
Merge pull request #23201 from alyf-de/website_theme_scss 
fix: style for website theme
 2020-09-30 18:26:58 +05:30
rohitwaghchaure
d65e050f4b
Update profit_and_loss_statement.py 2020-09-30 18:17:21 +05:30
Rohit Waghchaure
b428e4c493 fix: currency symbol in profit and loss report 2020-09-30 17:44:35 +05:30
Deepesh Garg
287014a9a2 fix: Remove any taxes fetched due to unknown rules 2020-09-30 13:42:10 +05:30
Deepesh Garg
fc71e5b5b7 fix: Remove any taxes fetched due to unknown rules 2020-09-30 13:42:00 +05:30
Deepesh Garg
23313538df
Merge pull request #23465 from abhishekbalam/currency_in_trial_balance 
fix(Accounts): Add Currency filter in Trial Balance report
 2020-09-30 13:16:16 +05:30
Marica
8fbd960f66
Merge branch 'develop' into update-items-perm 2020-09-30 12:51:35 +05:30
hasnain2808
3294f86b92 refactor: fix linting 2020-09-30 12:15:07 +05:30
Shivam Mishra
b04b53c613
Merge branch 'develop' into better-logging-for-membership 2020-09-30 12:01:54 +05:30
Shivam Mishra
86171a3fda
fix: translate error log 2020-09-30 12:01:35 +05:30
Shivam Mishra
3ec67077a9
chore: use .format for message 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-30 12:00:46 +05:30
Abhishek Balam
001e7e9df9 fix: remove default value 2020-09-30 10:39:26 +05:30
Abhishek Balam
42d8db59f0 fix: add currency select to Trial Balance 2020-09-30 01:32:42 +05:30
Deepesh Garg
bc44bc64cc fix: Add test 2020-09-29 18:39:45 +05:30
marination
661bf64bba fix: Check only Read and Write Permission in Update Items 2020-09-29 18:16:45 +05:30
Deepesh Garg
2b38361ff5 Merge branch 'develop' of https://github.com/frappe/erpnext into tax_fetch_quote 2020-09-29 17:26:48 +05:30
Deepesh Garg
c33fbd7e52
Merge pull request #23416 from anupamvs/quotation-portal 
feat: provision to draft quotation from portal
 2020-09-29 17:08:05 +05:30
barredterra
81ad90c1d4 feat: validate sales invoice for germany 2020-09-29 11:54:57 +02:00
Marica
25f4c1636e
Merge branch 'develop' into account-add-rename 2020-09-29 13:18:54 +05:30
Marica
3b610bd07d
Merge branch 'develop' into dialog-filters 2020-09-29 13:16:33 +05:30
michellealva
3aedeb642f fix: Change Error Message in Work Order 2020-09-29 12:54:55 +05:30
marination
65fc48da25 fix: Email Template and Codacy 
- Email Preview works well with email template
- Codacy for docstrings
 2020-09-29 12:46:19 +05:30
Marica
e5a60f1cec
Merge branch 'develop' into rfq-email 2020-09-29 11:56:44 +05:30
Marica
818522bd45
Merge branch 'develop' into dialog-filters 2020-09-28 21:18:23 +05:30
marination
629fa57f9d fix: Remove unneccessary div 2020-09-28 21:17:49 +05:30
marination
a6ea86432e fix: Skip Update Password in Preview 
- dont show update password button in preview, its for the suppliers mail only
- modified docstrings
- update supplier row contact only if None
 2020-09-28 21:05:11 +05:30
hasnain2808
a5e8e449ee chore: Merge branch 'develop' into UAE-VAT-Format 2020-09-28 20:43:03 +05:30
marination
f911228871 fix: UX and code cleanup 
- Added a small note in muted text at bottom of Dialog
- Dont call 'update_supplier_contact' at the time of preview, its a dummy view anyway
- Renamed `update_contact_of_supplier` to `link_supplier_contact`
- On sending mail, new users and contacts that were created get updated in RFQ doc
- Added docstrings to functions
 2020-09-28 20:21:44 +05:30
hasnain2808
23c8966e81 Merge branch 'develop' into UAE-VAT-Format 2020-09-28 20:06:02 +05:30
hasnain2808
2c62d946f5 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-09-28 20:03:27 +05:30
Mangesh-Khairnar
8d12c3841f fix: process transaction callback 2020-09-28 19:40:42 +05:30
hasnain2808
80068e16e8 Refactor(UAE VAT 21): Replace f-strings by format 2020-09-28 18:58:27 +05:30
Anupam
77cf53201a feat: open lead status on next contact date 2020-09-28 18:38:41 +05:30
marination
056c86033d fix: Reuse function to render email preview 
- Reused `supplier_rfq_mail` to render preview
- Print hid Salutation and Subject
- Completely dynamic greeting
 2020-09-28 17:42:22 +05:30
madar2020
ce39323a0a
feat: Allow rich text edit for questions (#23402) 
* rich text

* Update question.json

As to make sense for rich text

* Update quiz_question.json

* Update question.json

* Update quiz_question.json

* Update macros.html

fix: cards in second row of homepage section overlapps the row before.

* Revert "Update macros.html"

This reverts commit b649b507e5d546b5b4a78fbf68053493a71c7af2.

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-28 17:36:25 +05:30
marination
bd36f2b94d feat: Supplier Email Preview in RFQ 2020-09-28 15:59:03 +05:30
hasnain2808
587bb05a37 feat(UAE VAT 21): Add desk page for UAE VAT 21 2020-09-28 14:52:29 +05:30
hasnain2808
0860c74c82 feat(UAE VAT 21): Add permissions for doctypes 2020-09-28 14:38:45 +05:30
hasnain2808
2d30148940 feat(UAE VAT 21): Add vat settings 2020-09-28 14:38:14 +05:30
Raffael Meyer
21266fe4a4
Merge branch 'develop' into website_theme_scss 2020-09-28 10:15:55 +02:00
rohitwaghchaure
7b2f141d0d
Merge pull request #23441 from anupamvs/lead-contact-detail 
fix: flushing contact details, generates assignment rule issues
 2020-09-28 13:30:09 +05:30
hasnain2808
2a601e59bf fix(UAE VAT 21): remove extra legend 2020-09-28 13:26:43 +05:30
hasnain2808
bed1add349 docs(UAE VAT 21): add docstrings 2020-09-28 13:26:05 +05:30
hasnain2808
815b7584dd refactor(UAE VAT 21): seperate get_chart, get_data 2020-09-28 13:24:40 +05:30
Anupam
519a00ce44 fix: flushing contact details, generating assignment rule issues 2020-09-28 13:10:06 +05:30
hasnain2808
79aca28453 refactor(UAE VAT 21): rename UAE VAT - UAE VAT 21 2020-09-28 12:27:41 +05:30
Anupam Kumar
5b3af82e75
Update item_add_to_cart.html 2020-09-28 10:59:43 +05:30
Mangesh-Khairnar
98658603dd Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-09-28 02:10:53 +05:30
Sagar Vora
382676d875
Merge branch 'develop' into mr-stock-uom-v13 2020-09-27 20:09:00 +05:30
Mangesh-Khairnar
a26c6b4c2d fix: fetch account balance info 2020-09-25 23:56:39 +05:30
hasnain2808
127fbfcb93 feat(UAE VAT 21): Added Print Format 2020-09-25 20:42:54 +05:30
Anupam Kumar
6e0c1eeb68
Merge branch 'develop' into quotation-portal 2020-09-25 20:04:43 +05:30
prssanna
fec4ea5643 fix: set stock uom in tem while creating material request from stock entry 2020-09-25 18:01:12 +05:30
hasnain2808
321b5f54ae feat(UAE VAT 21): Add Roles for UAE VAT 21 Report 2020-09-25 14:24:57 +05:30
hasnain2808
72cad2a8ab feat(UAE VAT 21): Add zero rated and vat exempt 2020-09-25 13:13:38 +05:30
rohitwaghchaure
7512565184
fix: Patient Appointment not able to save (#23434) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-25 12:45:47 +05:30
hasnain2808
5225215d31 feat(UAE VAT 21): Add rows for inputs and tourists 2020-09-24 18:41:43 +05:30
Anupam
dd2f547c3b fix: Ui fixes 2020-09-24 16:37:08 +05:30