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

23992 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Anupam
519a00ce44 fix: flushing contact details, generating assignment rule issues 2020-09-28 13:10:06 +05:30
Anupam Kumar
5b3af82e75
Update item_add_to_cart.html 2020-09-28 10:59:43 +05:30
Sagar Vora
382676d875
Merge branch 'develop' into mr-stock-uom-v13 2020-09-27 20:09:00 +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
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
Anupam
dd2f547c3b fix: Ui fixes 2020-09-24 16:37:08 +05:30
Anupam
5a72022289 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-portal 2020-09-24 16:18:47 +05:30
Anupam
78ee75d744 fix: review changes 2020-09-24 16:17:02 +05:30
Saqib
2fa2a40b3f
chore: make asset movement transaction date match with purchase date & time (#23423) 2020-09-24 15:07:29 +05:30
Rucha Mahabal
9ed208364d
Merge branch 'develop' into enrollment-fixes 2020-09-24 14:31:23 +05:30
Anupam
a4df105813 fix: UI fixes 2020-09-24 13:21:54 +05:30
marination
4f395cce54 chore: Add Filter Group to dialogs 2020-09-24 12:43:41 +05:30
marination
8370d9b997 fix: Check Company in Payment Entry before selecting values 2020-09-24 11:51:03 +05:30
Anupam
09775bbdaa feat: showing UOM even item price is hidden 2020-09-24 11:19:32 +05:30
Shivam Mishra
0bd8719035
Merge branch 'develop' into better-logging-for-membership 2020-09-24 10:32:41 +05:30
Shivam Mishra
cee891aa92 refactor: better logging for membership 2020-09-24 10:31:36 +05:30
Anupam
c077fac2a6 feat: provision to draft quotation from portal 2020-09-23 22:02:31 +05:30
Marica
d5e6eb75cf
Merge branch 'develop' into supplier-quotn-comparison 2020-09-23 21:06:18 +05:30
Deepesh Garg
cfc5e29127
fix: Post cancellation accounting entry on posting date instaed of current (#23361) 2020-09-23 17:19:11 +05:30
Prssanna Desai
fd42af5b91
fix: ignore permission while creating supplier scorecard period in supplier scorecard (#23406) 2020-09-23 17:14:37 +05:30
Rucha Mahabal
46d4180381
refactor: Issue form cleaned up and renamed Minutes to First Response field (#23066) 
* refactor: re-order fields in Issue DocType

* refactor: rename Mins to First Response to First Response Time

* refactor: First Response Time Reports for Issue and Opportunity

* fix: added patch for renamed fields and setting durations

* chore: update CRM and Support Desk Pages for Response Time reports

* fix: first response time for opportunity report

* fix: patch

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-09-23 16:53:16 +05:30
Marica
f804eacfb5
Merge branch 'develop' into fix-report-gp 2020-09-23 15:36:23 +05:30
Michelle Alva
879a8ef26b
fix: Change button label in Item (#23410) 2020-09-23 15:36:07 +05:30
Raffael Meyer
8b78bf19bd
Merge branch 'develop' into website_theme_scss 2020-09-23 11:38:59 +02:00
Afshan
8be51e22c4 fix: escape apostrophe in cost centre and project if exist 2020-09-23 14:52:36 +05:30
marination
fd155408e5 fix: Check if account exists in parent company on rename 
- Check if child company is dependent on parent company
- Check if account-to-be-renamed exists in parent, if yes, block
- Revised Test basd on the same
 2020-09-23 14:42:10 +05:30
Saqib
1831893b77
fix: failed workflow condition error message in update items (#23393) 2020-09-23 13:01:49 +05:30
Marica
dd10c54baa
Merge branch 'develop' into supplier-quotn-comparison 2020-09-23 12:58:35 +05:30
Deepesh Garg
2bf4245334 fix: Conversion factor fixes in Stock Entry 2020-09-23 12:50:06 +05:30
gavin
639542c81d
Merge pull request #22867 from marination/youtube-analytics 
feat: Youtube interactions via Video
 2020-09-22 18:02:31 +05:30
marination
6087fcaa9b chore: Added video settings to List View Menu 2020-09-22 17:48:04 +05:30
rohitwaghchaure
27bccd7f81
Merge pull request #23397 from deepeshgarg007/search_field_batch_query 
feat: Show searchfields in batch query
 2020-09-22 16:59:24 +05:30
gavin
d935b2753f
Merge branch 'develop' into youtube-analytics 2020-09-22 15:36:00 +05:30
Anupam
c39b65a5f5 fix: quality procedure parent 2020-09-22 14:23:54 +05:30
Deepesh Garg
a0d192eae4 feat: Show searchfields in batch query 2020-09-22 13:54:07 +05:30
Shivam Mishra
2b53b98c1d
fix: reload dashboard (#23380) 2020-09-22 12:18:12 +05:30
rohitwaghchaure
9e6d377eea
Merge pull request #23370 from prssanna/account-user-permission 
fix: apply user permissions in tax accounts query
 2020-09-22 10:34:35 +05:30
rohitwaghchaure
7230b0f9a0
Merge pull request #23360 from anupamvs/batch-wise 
fix: Batch-Wise Balance History filter validation
 2020-09-22 10:32:51 +05:30
Marica
cbac025a5f
Merge branch 'develop' into supplier-quotn-comparison 2020-09-21 22:08:38 +05:30
Mangesh-Khairnar
e3c6128638
fix(plaid): do not send null list in account ids (#23376) 2020-09-21 18:50:22 +05:30
Saurabh
30dbfc31e2
Merge pull request #23369 from abhishekbalam/breadcrumbs_for_maintenance 
Fix(Maintenance): Breadcrumbs for Maintenance Visit and Schedule
 2020-09-21 17:03:46 +05:30
Saurabh
324cbe89f8
Merge pull request #23359 from abhishekbalam/activation 
fix(activation): Added New DocTypes in get_level()
 2020-09-21 15:38:45 +05:30
prssanna
de7a2bc4be fix: apply user permissions in tax accounts query 2020-09-21 13:57:04 +05:30
Rohan
e42f08085b
fix: use Plaid's new API (develop) (#23318) 
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-09-21 13:14:07 +05:30
Abhishek Balam
97f61d233e fix: breadcrumbs for maintenance visit and schedule under support 2020-09-21 13:00:43 +05:30
Deepesh Garg
44c692ed40
Merge pull request #23278 from barry86m/patch-3 
fix: sql error on saving sales invoice without a sales order
 2020-09-20 20:40:16 +05:30
Deepesh Garg
c152b92ef4
Update erpnext/controllers/selling_controller.py 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-20 20:04:10 +05:30
Deepesh Garg
5c8dd6a0ed
Merge pull request #23355 from Anurag810/accounts_recievable 
fix: Cost Center filter in accounts receivable and payable report
 2020-09-20 19:36:30 +05:30
Saqib
f2ea3877c8
fix: depreciation start date ux fixes (#23339) 2020-09-20 19:31:18 +05:30
Saqib
4b25eb4db4
fix: mode of payment not fetched if no account is set (#23334) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-19 19:33:21 +05:30
Deepesh Garg
6bcfffda1d
Merge branch 'develop' into barredterra-patch-1 2020-09-19 18:33:14 +05:30
Deepesh Garg
c646a56d68
fix: Update modified timestamp 2020-09-19 18:28:20 +05:30
Deepesh Garg
e3ee63f677
Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter 
fix: warehouse address filtered based on warehouse
 2020-09-19 18:17:08 +05:30
Deepesh Garg
095161ff60
Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error 
fix: set_taxes() missing 1 required positional argument: 'company'
 2020-09-19 18:07:08 +05:30
Deepesh Garg
0aff6d83af
Update erpnext/public/js/utils/party.js 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-19 18:05:58 +05:30
marination
b782d2a99d fix: Added back accidentally deleted field 2020-09-19 01:04:28 +05:30
marination
90d9d80ef9 fix: More MR UX fixes 2020-09-19 00:43:53 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
 2020-09-18 18:27:24 +05:30
Anupam
bf166736b0 fix: Batch-Wise Balance History filter validation 2020-09-18 17:15:49 +05:30
Abhishek Balam
123eaea1a6 fix: added new doctypes in get_level 2020-09-18 16:35:59 +05:30
Michelle Alva
cc6ca97dc5
fix: Item-wise Sales History Report Error (#23349) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-18 15:50:29 +05:30
Saqib
c29ee691d4
fix: button click event not working in POS custom fields (#23358) 2020-09-18 15:27:17 +05:30
Marica
2cfaf71d59
Merge branch 'develop' into supplier-quotn-comparison 2020-09-18 15:22:59 +05:30
Anurag Mishra
170ecdc76e fix: No handlefor Cost centers in Accounts Receivable 2020-09-18 13:26:46 +05:30
SDLyu
68672af8ab
Fix missing tax autoload when frm.doc.taxes is [] 2020-09-18 13:58:23 +08:00
Deepesh Garg
6f3d93e5a0 fix: Taxes not getting fetched from Opportunity to Quotation 2020-09-18 11:23:35 +05:30
Afshan
d5710b4d6f style: removed extra spaces 2020-09-17 13:01:47 +05:30
Afshan
e813684433 fix: warehouse address filtered based on warehouse 2020-09-17 12:57:26 +05:30
Deepesh Garg
2aea184f6f
Merge pull request #23309 from anupamvs/sales-analytics 
feat: added project in Sales Analytics report
 2020-09-17 12:37:14 +05:30
Rucha Mahabal
c78ca36ee5 fix(Non Profit): Hide Address and Contact section for unsaved docs 2020-09-16 23:47:33 +05:30
Anupam Kumar
11649efc41
Merge branch 'develop' into sales-analytics 2020-09-16 21:45:57 +05:30
Deepesh Garg
5c04b2eea4
Merge pull request #23235 from Anurag810/custom_remark 
feat: added option to add custom remarks in payment entry
 2020-09-16 13:38:04 +05:30
Deepesh Garg
15f698251b
Merge pull request #23079 from marination/item-tax-update-items 
fix: Item Tax Updating via `Update Items` in SO/PO
 2020-09-15 20:47:20 +05:30
Deepesh Garg
db52cfe05a
Merge pull request #22849 from alyf-de/datev_refactor 
refactor: move datev-specific stuff to utils
 2020-09-15 19:50:00 +05:30
Rucha Mahabal
8193582645 fix: codacy issue 2020-09-15 18:53:38 +05:30
Marica
9ce5c77a21
Merge branch 'develop' into supplier-quotn-comparison 2020-09-15 18:50:34 +05:30
Rucha Mahabal
253936c8df fix: create Course Enrollment only for courses added in Program Enrollment 2020-09-15 18:16:42 +05:30
Rucha Mahabal
42d7acf522 fix: academic term and year date validations 2020-09-15 17:52:47 +05:30
Marica
f63b6719e3
Merge branch 'develop' into item-tax-update-items 2020-09-15 17:45:05 +05:30
marination
f995f517c9 fix: Test 2020-09-15 17:06:27 +05:30
Rucha Mahabal
f5eb45bf23 fix: validate academic term while checking for enrollment duplication 2020-09-15 17:01:00 +05:30
Rucha Mahabal
68a07eda72 fix: program enrollment date not considered during course enrollment 2020-09-15 16:55:35 +05:30
Deepesh Garg
2f50cb3e58 fix: Supplier trigger onload 2020-09-15 15:00:32 +05:30
Rohit Waghchaure
4f3b7da9ba fix: set_taxes() missing 1 required positional argument: 'company' 2020-09-15 14:47:36 +05:30
Anupam Kumar
699e853009
Merge branch 'develop' into sales-analytics 2020-09-15 13:24:02 +05:30
Anurag Mishra
9397b7f58b fix: requested changes 2020-09-15 12:36:01 +05:30
Anupam
bae2d5d485 fix: review changes 2020-09-15 12:12:31 +05:30
marination
665c27af58 fix: Merge conflict missing line 2020-09-15 12:04:38 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items 2020-09-15 11:30:22 +05:30
marination
4bb8d0c193 chore: Test for PO 2020-09-15 11:18:02 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO (#22869) 
* feat: uom in update items for SO & PO

* fix: supplied items doesn't updates on uom change

* chore: add uom and conv factor change test

* fix: test

* fix: purchase order updates are not tracked

* fix: fetch conversion factor on uom change

* fix: codacy

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-15 11:14:31 +05:30
Marica
65c2c4f85f
Merge branch 'develop' into item-tax-update-items 2020-09-15 09:49:06 +05:30
Deepesh Garg
36bc0577a2
fix: Item GL entries for purchase invoice (#23027) 2020-09-15 09:44:46 +05:30
marination
b7cd84196d fix: Revert tax calculation changes 2020-09-15 09:42:51 +05:30
Anupam Kumar
8cb356bf30
Merge branch 'develop' into sales-analytics 2020-09-14 11:21:58 -07:00
Rucha Mahabal
fcb6ba6ec7
fix: get_transaction_entries function arguments in Bank Statement Transaction Entry (#23051) 2020-09-14 21:12:36 +05:30
Marica
a544e10778
Merge branch 'develop' into supplier-quotn-comparison 2020-09-14 20:17:59 +05:30
Saqib
6db92fbb6a
feat: validate workflow before so/po update items (#23024) 
* feat: validate workflow before so/po update items

* fix: incorrect workflow validation on so/po update items

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-14 19:54:17 +05:30
Deepesh Garg
93d7c2f1da
Merge pull request #23283 from ruchamahabal/fix-student-email-id 
fix: Set student email id mandatory only if skip user creation is disabled
 2020-09-14 19:34:10 +05:30
marination
59239172a1 feat: Supplier Quotation Comparison - v3 2020-09-14 17:34:21 +05:30
Rucha Mahabal
026cf2d3cc
Merge branch 'develop' into refactor-lab-module 2020-09-14 14:45:19 +05:30
Marica
c4a8c9eb26
Merge branch 'develop' into pr-dn-get-items 2020-09-14 11:09:32 +05:30
marination
9205101ecf fix: Make Reference fields mandatory in Quality Inspection 2020-09-12 16:17:13 +05:30
marination
0a688005be fix: Make sure Supplier/Customer is selected before fetching Items. 2020-09-12 15:39:27 +05:30
barredterra
16f1435d63 fix: codacy 2020-09-11 18:57:58 +02:00
barredterra
41978ac882 Merge branch 'develop' into datev_refactor 2020-09-11 17:54:50 +02:00
barredterra
8e41fdfee4 Merge branch 'develop' into website_theme_scss 2020-09-11 16:05:49 +02:00
barredterra
60bfbbc5af fix: use path istead of hook 2020-09-11 16:05:10 +02:00
marination
02c550c07d fix: Redundant imports 2020-09-11 16:22:54 +05:30
Marica
1807437fe0
Merge branch 'develop' into youtube-analytics 2020-09-11 16:18:23 +05:30
marination
9533318832 chore: Tests for Rename and Add child Account 2020-09-11 16:09:27 +05:30
Anupam K
ed08e593c3 feat: added project in Sales Analytics report 2020-09-11 14:03:31 +05:30
Saqib
cd89994b33
fix: multiple pos issues (#23297) 
* fix: returns can be made against unconsolidated invoices

* fix: indentation

* fix: mode of payment not fetching for pos returns

* patch: default pos profile print format

* fix: tests

* chore: clean up retail desk page
 2020-09-10 19:28:46 +05:30
marination
37b99d202d fix: Separate function to get bulk and single youtube stats 2020-09-10 18:27:20 +05:30
Rucha Mahabal
a29436dc91 fix: codacy 2020-09-10 17:45:17 +05:30
Rucha Mahabal
c0f9d1b65a test: Lab Module 2020-09-10 17:33:52 +05:30
marination
799d663398 fix: Make set_youtube_statistics reusable and job logic fix 
- Make sure job runs only once every hour
- set_youtube_statistics should be usable in and outside class
 2020-09-10 16:42:20 +05:30
Gavin D'souza
71ac399369 fix: Commonified function and updated scheduler events 
Co-authored-by: marination <maricadsouza221197@gmail.com>
 2020-09-10 13:58:48 +05:30
Gavin D'souza
0a0e258d8b feat: Add Desk Page for Utilities for Video group 2020-09-10 13:12:35 +05:30
Rucha Mahabal
42bff3289d
Merge branch 'develop' into refactor-lab-module 2020-09-10 12:36:29 +05:30