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

18327 Commits

Author SHA1 Message Date
Himanshu Warekar
c5999154e6 fix: test cases and use orm 2019-05-06 23:43:16 +05:30
Faris Ansari
ff9177a6ce fix: Handle attribute filter when no items found 2019-05-06 15:59:51 +05:30
Faris Ansari
aa7ce883ed fix: Dont include disabled items in cache 2019-05-06 15:59:34 +05:30
Mangesh-Khairnar
09d4933edb fix: filter pi item based on po completeion 2019-05-06 12:53:52 +05:30
Himanshu Warekar
aa0eaab3df fix: codacy 2019-05-06 01:35:11 +05:30
Himanshu Warekar
785f98efd9 minor: change autoname for sla 2019-05-06 00:43:38 +05:30
Himanshu Warekar
9faaa17d9d patch: fixes 2019-05-05 23:55:17 +05:30
Himanshu Warekar
f8b9c849a1 fix: test cases for sla 2019-05-05 22:51:18 +05:30
Himanshu Warekar
fbb7ea4856 fix: patch fix 2019-05-05 17:21:38 +05:30
Himanshu Warekar
134ad61604 fix: patch fixes 2019-05-05 16:26:11 +05:30
Himanshu Warekar
917e534191 patch: fix to migrate to new sla structure 2019-05-05 14:43:11 +05:30
Himanshu Warekar
e9b159c500 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-05 12:45:50 +05:30
Himanshu Warekar
ec54e3d831 patch: migrate to new sla structure 2019-05-05 12:31:04 +05:30
Himanshu Warekar
b3070ca765 fix: display sla indicators at the top 2019-05-05 12:19:08 +05:30
Himanshu Warekar
898ab61dd4 fix: Child table for priority 2019-05-04 23:16:02 +05:30
Himanshu
ac1ce5d205 fix: Remove Scheduling Tool if exists (#17473) 
* fix: scheduling tool

* fix: patch for scheduling tool

* fix: remve drop table
 2019-05-04 22:43:37 +05:30
Rohan
174aa24529 fix(stock): Allow expired batches to be flushed out of the system (#17478) 2019-05-04 22:41:05 +05:30
Rushabh Mehta
e12bedc0c2 fix: unlink task rather than deleting it (#17485) 2019-05-04 22:39:31 +05:30
Faris Ansari
14425575b7 fix: Rebuild cache in background (#17487) 2019-05-04 22:38:13 +05:30
Himanshu
5cf12a4640 fix(Purchase Order): fetch payment terms (#17121) 
* fix: fetch payment terms

* fix: test fixes

* fix: test cases

* fix: test case

* fix: check for payment terms fetching

* fix: test cases

* refactor: fetch payment terms in account settings

* fix: add fetch terms to account settings
 2019-05-04 22:37:35 +05:30
Himanshu Warekar
24442af9ae fix: use list comprehension 2019-05-04 22:35:52 +05:30
Himanshu Warekar
fbed6a12d5 fix: calculate percentage only if sales team exist 2019-05-04 22:35:52 +05:30
Himanshu Warekar
40b99e3347 fix: sales percentage equal to 100 2019-05-04 22:35:52 +05:30
Himanshu Warekar
5ca977a41c fix: python side validation 2019-05-04 22:35:52 +05:30
Himanshu Warekar
76eddcc29f fix: validate percentage total 2019-05-04 22:35:52 +05:30
Rushabh Mehta
2df16b1f9b fix(style): demo home page 2019-05-04 11:09:19 +05:30
Mangesh-Khairnar
e003cc8812 fix: filter out completed purchase receipt 2019-05-03 16:41:04 +05:30
Mangesh-Khairnar
13d393247a feat: add date range filters 2019-05-03 16:00:02 +05:30
Anurag Mishra
d0cdb4a1e9 feat: subcontracting report 2019-05-03 14:05:29 +05:30
Faris Ansari
ab14892fc5 fix: Variant naming if optional attributes 2019-05-03 13:57:20 +05:30
Faris Ansari
cb03bb1c00 fix: Allow variant attributes to be optional 2019-05-03 13:41:50 +05:30
Himanshu Warekar
00a494f07b fix: change sla on priority 2019-05-03 12:44:35 +05:30
Deepesh Garg
8ca3df7aac
Merge pull request #17466 from deepeshgarg007/inactive-items-fix-develop 
fix: Inactive sales items report fix
 2019-05-03 11:54:05 +05:30
deepeshgarg007
3c1b9aa77b fix: Remove patch 2019-05-03 09:47:38 +05:30
Nabin Hait
f13abe8332
Merge pull request #17464 from Mangesh-Khairnar/task-unlink 
feat: unlink task from project on task deletion
 2019-05-03 09:20:34 +05:30
deepeshgarg007
6c6b24011f Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop 2019-05-02 23:03:59 +05:30
Faris Ansari
b9dc4687dc
fix: Remove parens 2019-05-02 20:14:16 +05:30
deepeshgarg007
9ae112bbfc fix: Inactive items report fix 2019-05-02 19:38:15 +05:30
Mangesh-Khairnar
ffd4990a70 feat: unlink task from project on task deletion 2019-05-02 19:19:03 +05:30
Nabin Hait
73041269e9 refactor: Project and billing summary 2019-05-02 18:13:31 +05:30
Nabin Hait
bd0d10f82a
Merge pull request #17448 from nabinhait/woocommerce-multilingual-fix-dev 
fix: Multilingual handling in woocommerce integration
 2019-05-02 12:57:34 +05:30
Nabin Hait
218d551c99
Merge pull request #17105 from nabinhait/gst-category-fieldtype 
fix: Set GST Category fieldtype as Select in invoice
 2019-05-02 12:43:09 +05:30
Saurabh
7c5d3873fe
Merge branch 'develop' into auto-account-creation-company-tree-dev 2019-05-02 12:01:46 +05:30
Nabin Hait
5a7c5bc4dd
Merge pull request #17435 from rmehta/coa-sorting 
fix(minor): chart of accounts sorting and message
 2019-05-02 11:57:08 +05:30
Saurabh
321c0feed8
Merge branch 'develop' into woocommerce-multilingual-fix-dev 2019-05-02 11:46:53 +05:30
Rushabh Mehta
27a30c842d fix: simplify sort condition 2019-05-02 09:23:56 +05:30
Nabin Hait
3d64a5da5e
Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign 
feat: Additional fields in campaign
 2019-05-02 03:18:22 +05:30
Nabin Hait
9cce19a65c
Merge pull request #17438 from netchampfaris/cart-route 
fix(cart): Don't use window.open as it can be blocked
 2019-05-02 03:17:58 +05:30
Nabin Hait
e93702032b
Merge branch 'develop' into task-depends-on-code 2019-05-02 00:59:23 +05:30
Nabin Hait
bbcf43961c
Merge branch 'develop' into cart-route 2019-05-02 00:59:13 +05:30
Nabin Hait
7ca243094e
Merge branch 'develop' into coa-sorting 2019-05-02 00:58:56 +05:30
Nabin Hait
d539def25d
Update campaign.json 2019-05-02 00:44:29 +05:30
Nabin Hait
9d04b67f46 fix: Validate parent account of child company while creating new account based on parent company 2019-05-01 20:26:36 +05:30
Nabin Hait
4ee2cec8e2
Merge pull request #17444 from nabinhait/work-order-bom-image-dev 
feat: Added item image in work order and bom
 2019-05-01 19:31:15 +05:30
Nabin Hait
9ccdf594c3
Merge pull request #17445 from rmehta/refactor-child-tables 
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
 2019-05-01 19:31:00 +05:30
Nabin Hait
64346c08c6
Merge pull request #17446 from netchampfaris/product-configurator-skip-disabled-items 
fix: Skip disabled items in product configurator
 2019-05-01 19:27:59 +05:30
Nabin Hait
c64cc331b7
Update item_variants_cache.py 2019-05-01 19:27:23 +05:30
Nabin Hait
284e5a284e
Update item_variants_cache.py 2019-05-01 19:26:56 +05:30
Nabin Hait
240008d7c6 fix: Multilingual handling in woocommerce integration 2019-05-01 19:18:40 +05:30
Faris Ansari
4ca948d7ea fix: Skip disabled items in product configurator 2019-05-01 18:19:24 +05:30
deepeshgarg007
1cfe96193f Merge branch 'develop' of https://github.com/frappe/erpnext into rename_report_develop 2019-05-01 18:14:07 +05:30
deepeshgarg007
75afff2f6d Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-05-01 18:05:11 +05:30
Rushabh Mehta
c3aecb1fbd fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table 2019-05-01 18:04:22 +05:30
deepeshgarg007
c5e6886937 feat: Notification for material request receipt 2019-05-01 18:03:40 +05:30
Nabin Hait
621006642c feat: Added item image in work order and bom 2019-05-01 17:20:21 +05:30
Nabin Hait
dc86bc756e
Merge pull request #17441 from nabinhait/pe-ref-exchange-rate-dev 
fix: Always fetch exchange rate from ref document
 2019-05-01 17:18:35 +05:30
Aditya Hase
8b8e3e7890
Merge pull request #17424 from adityahase/fix-py3-misc 
fix: Python 3 compatibility fixes
 2019-05-01 16:45:11 +05:30
deepeshgarg007
bffa060ff6 Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-05-01 16:33:11 +05:30
Nabin Hait
6d9334810e fix: reverted fetch from as the field does not exists for some ref doctypes 2019-05-01 15:40:00 +05:30
Nabin Hait
3191d072f0 fix: Always fetch exchange rate from ref document 2019-05-01 15:37:03 +05:30
Nabin Hait
0af45b41d7
Merge pull request #17426 from adityahase/fix-py3-regional-france 
fix(py3): Undefined variable
 2019-05-01 15:05:24 +05:30
Nabin Hait
41423815a7
Merge pull request #17431 from nabinhait/deferred-accounting-long-job-dev 
fix: moved deferred accounting monthly job to long job
 2019-05-01 15:04:12 +05:30
Faris Ansari
358329d7df fix: Hide button and cart after success 2019-05-01 14:56:50 +05:30
Faris Ansari
5f1eebec16 fix(cart): Don't use window.open as it can be blocked 
window.open calls are interpreted as popups by some browsers and are
blocked.

Also, route to Quotation web view instead of printview.
 2019-05-01 14:32:15 +05:30
Nabin Hait
89b06132cd minor fix 2019-05-01 14:20:08 +05:30
Nabin Hait
10dae5d3c3 fix: Set GST Category fieldtype as Select in invoice 2019-05-01 14:18:37 +05:30
deepeshgarg007
6dfbd2bb64 fix: Delete old report 2019-05-01 14:17:16 +05:30
deepeshgarg007
db999e293b fix: Rename Inactive Items report to Inactive Sales Item 2019-05-01 14:06:06 +05:30
Rushabh Mehta
43958dcd11 fix(minor): chart of accounts sorting and message 2019-05-01 13:53:05 +05:30
Nabin Hait
cc6ee8e16e
Merge pull request #17154 from nabinhait/item-discount 
fix: Calculate rate based on discount on server side, only if not rate or pricing rule applied
 2019-05-01 13:44:21 +05:30
Nabin Hait
4c724dc3cb
Merge pull request #17428 from nabinhait/ss-fixes-dev 
Few fixes in payroll
 2019-05-01 13:44:05 +05:30
Nabin Hait
991b95fbec
Merge pull request #17434 from nabinhait/payment-entry-exchange-rate-dev1 
fix: Fetch exchange rate from invoice on server side
 2019-05-01 13:35:12 +05:30
Nabin Hait
316c3b3f9d fix: Fetch exchange rate from invoice on server side 2019-05-01 13:34:17 +05:30
Faris Ansari
7899412d9e fix: Set depends_on_tasks to Code 
It tracks a list of dependent tasks which can exceed 140 characters
 2019-05-01 13:31:56 +05:30
Nabin Hait
b9b2a06847 moved deferred accounting monthly job to long job 2019-05-01 12:50:23 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount 2019-05-01 12:23:30 +05:30
Nabin Hait
5762a5d8b6 fix: Null handling 2019-05-01 12:17:55 +05:30
Nabin Hait
a08bf7ef86 fix: a few fixes in payroll 2019-05-01 12:17:47 +05:30
Aditya Hase
e7d712934f
Merge branch 'develop' into fix-py3-asset-value-adjustment 2019-05-01 11:55:35 +05:30
Aditya Hase
5bbff9de6c
Merge branch 'develop' into fix-py3-regional-france 2019-05-01 11:55:32 +05:30
Aditya Hase
ee0093c593
Merge branch 'develop' into fix-py3-misc 2019-05-01 11:55:28 +05:30
Aditya Hase
234d35781c fix: Python 3 compatibility fixes 
import reduce from functools

Undefined variable
 2019-05-01 11:52:37 +05:30
Aditya Hase
1db334317d fix(py3): Undefined variable 2019-05-01 11:51:04 +05:30
Aditya Hase
97ad454525 fix(py3): Undefined variable 2019-05-01 11:50:05 +05:30
Nabin Hait
39f58ae92b
Merge pull request #17392 from ashish-greycube/develop_allow_bank_account_import 
fix: allow_import_of_bank_account_by_account_manager
 2019-05-01 11:16:33 +05:30
Nabin Hait
8dc7401ddf
Merge pull request #17388 from ashish-greycube/correct_party_type_values 
fix: show only party_type doctypes in Party Type field of bank account
 2019-05-01 11:15:02 +05:30
Nabin Hait
7516e7e66e
Merge pull request #17082 from Anurag810/aahi_loan_report 
feat: Loan repayment report
 2019-05-01 11:02:55 +05:30
Nabin Hait
71a07bf022
Update loan_repayment.json 2019-05-01 11:02:35 +05:30
Mangesh-Khairnar
cc8e2b6aca test: pass filters to execute 2019-05-01 10:03:57 +05:30
Nabin Hait
dff4cce8fd
Merge pull request #17408 from Mangesh-Khairnar/salary-register-fix 
fix(salary-register): Track doj for non active employee
 2019-05-01 09:57:28 +05:30
Karthikeyan S
6b77f6edf3 fix: woocommerce settings patch (#17422) 
(cherry picked from commit 7df8c0ef82d72920aba342623dc10c5c14b1d8f8)
 2019-05-01 09:07:44 +05:30
Faris Ansari
1e55c2e713
Remove old style custom scripts (#17077) 
* fix: Move Newsletter script from frappe to erpnext

* fix: Remove old style client scripts

* C-Form

* fix: Cost Center

* fix: Fiscal Year

* fix: Monthly Distribution

* fix: Payment Gateway Account

* fix: Pricing Rule

* fix: Missing semicolon
 2019-04-30 10:18:09 +05:30
Suraj Shetty
c87b47a575
fix: Price list conversion for other UOM from stock UOM item price (#17386) 
* fix: Price list for UOM other than stock UOM

-Fixes conversion from default UOM item price to  other UOMs

* fix: Typo
 2019-04-29 23:18:47 +05:30
Faris Ansari
4b21225cf4
fix: Map item_code to title (#17403) 
When making Project from Sales Order, description was mapped
with Task title which can exceed 140 characters easily.
Description should be mapped with description as it is html field.
 2019-04-29 22:41:48 +05:30
Faris Ansari
61b4afc3c5
perf: Order by name instead of parent (#17404) 
Changing the order by column reduced the query time from 60s to 12s
 2019-04-29 22:41:24 +05:30
Basawaraj Savalagi
d4585efc6a feat: Additional fields in campaign 2019-04-29 22:12:50 +05:30
deepeshgarg007
36e161df74 Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-04-29 21:44:51 +05:30
deepeshgarg007
f2fb0e03e6 fix: Add status for partial received 2019-04-29 21:42:48 +05:30
Rushabh Mehta
9f660267c1
Merge pull request #17397 from Thunderbottom/manufacturing-demo-fix 
fix(demo): make demo work again
 2019-04-29 15:18:28 +05:30
Rushabh Mehta
1efade3408 fix(task): weight editable 2019-04-29 15:00:20 +05:30
Aditya Hase
8afeda924d fix: Use all address lines instead of only first two 2019-04-29 13:09:23 +05:30
Mangesh-Khairnar
513e3f97e5 fix(salary-register): track doj for non active employee 2019-04-29 12:17:49 +05:30
Aditya Hase
ba61be93ae refactor: Major changes 2019-04-29 06:00:27 +05:30
Aditya Hase
b6e9eb9784 feat(tally): Preprocess and create items and uoms 2019-04-28 19:24:58 +05:30
Aditya Hase
27ab5b540b fix(tally): Use LEDSTATENAME instead of STATENAME 2019-04-28 19:24:58 +05:30
Aditya Hase
f2202cf638 feat(tally): Preprocess and create parties and addresses 2019-04-28 19:24:58 +05:30
Aditya Hase
0668482f82 feat(tally): Create chart of accounts from tally master data 2019-04-28 19:24:58 +05:30
Aditya Hase
55d465f3ad feat(tally): Preprocess master data to generate COA 2019-04-28 19:24:58 +05:30
Aditya Hase
9a84a99ac0 feat(tally): Add Tally Migration DocType 2019-04-28 19:24:58 +05:30
Mangesh-Khairnar
96661ba847 feat: add filters for multiple company operation 2019-04-28 17:11:28 +05:30
Chinmay Pai
b503896594
fix(demo): make demo work again 
definitely not a maga rebranding.

* import erpnext and set default company for accounts
* replace job card start/end date with job card time log
* create a doc for lost_reason
* pass opportunity/quotation lost_reason as a list of dicts
* fix company in stock reconciliation

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-04-27 01:39:50 +05:30
deepeshgarg007
c23b70950e Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-04-26 16:43:06 +05:30
Mangesh-Khairnar
9cd9671bb5 fix: minor changes 2019-04-26 16:02:25 +05:30
ashish-greycube
e4e8197f46 codacy review 2019-04-26 14:06:21 +05:30
ashish-greycube
0ed9ec9a03 fix : allow_import_of_bank_account_by_account_manager 2019-04-26 12:42:14 +05:30
rohitwaghchaure
fa626bd3ab
Merge pull request #17372 from rohitwaghchaure/fix_straight_line_asset_depreciation_develop_v12 
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
 2019-04-26 12:04:32 +05:30
ashish-greycube
467609b193 show only party_type doctypes in Party Type field of bank account 2019-04-26 11:35:04 +05:30
Shivam Mishra
377b230e41
Merge branch 'develop' into lms-fixes-1 2019-04-26 08:42:33 +05:30
Mangesh-Khairnar
da7b1673c3 test: track pi and pr changes 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
869544c0bc fix: add mapped records as functions 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
438fa620b0 feat: fetch purchase invoice and purchase receipt records for actual cost calculation 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
fcd0edf415 test: compare expected data to generated data 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
46b9204e9d feat: fetch data from budget records for cost estimation 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
5de08f71c5 feat: fetch all required fields from po 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
69909c0f51 feat: create procurement tracker report 2019-04-26 01:31:16 +05:30
Nabin Hait
4fcefda6c7
Merge pull request #17332 from deepeshgarg007/automatic_so_po 
feat: Automatic inter company Sales and Purchase order
 2019-04-26 00:24:08 +05:30
Nabin Hait
5c4b7b32a1
Merge pull request #17373 from netchampfaris/item-attribute-order-dynamic 
fix: Order Item attribute values dynamically
 2019-04-26 00:21:39 +05:30
Nabin Hait
4c31acf5e4
Merge pull request #17382 from nabinhait/tax-exemption-dev 
refactor: Employee Tax Exemption (develop)
 2019-04-26 00:20:46 +05:30
Nabin Hait
ec7a18737b fix: test cases 2019-04-25 22:30:23 +05:30
Nabin Hait
6adfc5618d fix: test cases 2019-04-25 21:42:26 +05:30
Nabin Hait
1d21d89d2f
Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop 
fix: Trial balance finance book issue
 2019-04-25 20:34:38 +05:30
Nabin Hait
49446ba760 fix: test cases 2019-04-25 19:54:49 +05:30
Shivam Mishra
9fe7257bfc fix (ui): refactored breadcrumbs 2019-04-25 19:44:37 +05:30
Shivam Mishra
2428485ebb fix (ui): Card layout 2019-04-25 19:33:22 +05:30
Shivam Mishra
37a55345fd feat: removed home page for lms role 2019-04-25 19:29:56 +05:30
Nabin Hait
04e7bf464f refactor: Employee Tax Exemption 2019-04-25 18:53:39 +05:30
Nabin Hait
e70696e111
Merge branch 'develop' into pos-advance-dev 2019-04-25 17:53:56 +05:30
Rohit Waghchaure
c181064782 fix: Trial balance finance book issue 2019-04-25 17:51:09 +05:30
Nabin Hait
4a994d4eb8 fix: Don't allocate advance if pos 2019-04-25 17:49:38 +05:30
deepeshgarg007
ce809d57a2 Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po 2019-04-25 14:29:31 +05:30