Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,749 Commits 3 Branches 0 Tags 1 GiB
4218c56bdc
Commit Graph

21013 Commits

Author SHA1 Message Date
Deepesh Garg
a00c98bea7
Merge pull request #19260 from Anurag810/Trends-Fixes 
fix: Query Condition On Billing date filters in Purchase invoice trends Report.
 2019-10-07 17:40:24 +05:30
Mangesh-Khairnar
d5e9cd72df
Merge branch 'develop' into lwp_half_day_fix 2019-10-07 16:08:30 +05:30
Mangesh-Khairnar
75397b441f
style(salary-slip): fixed formatting 2019-10-07 16:08:15 +05:30
Anurag Mishra
fe5890b828 fix: Query Condition On Billing date filters 2019-10-07 14:27:07 +05:30
Pranav Nachnekar
1f1b7eb7d5
Merge branch 'develop' into develop 2019-10-07 06:12:45 +00:00
Deepesh Garg
817443c5dd
Merge pull request #19253 from Thunderbottom/e-invoice-disc-fix 
chore: check if discount_percentage exists
 2019-10-06 23:47:52 +05:30
rohitwaghchaure
16b8e7c432
Merge pull request #19248 from rohitwaghchaure/not_able_to_submit_work_order_v12 
fix: not able to submit the work order
 2019-10-05 23:29:44 +05:30
Chinmay D. Pai
01aca675ef
chore: check if discount_percentage exists 
fixes TypeError: '>' not supported between instances of 'NoneType' and 'float'

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-10-05 10:18:21 +05:30
Rohit Waghchaure
484e1fb218 fix: not able to submit the work order 2019-10-04 17:58:21 +05:30
Pranav Nachanekar
e18388ade3 fix:add exception for no opportunity 2019-10-04 16:32:32 +05:30
sahil28297
2caf32d421 fix(patch): Reload Leave Type (#19240) 2019-10-04 16:24:53 +05:30
Saqib
d5067b4d73 chore: label changes in retail and stock (#19243) 2019-10-04 16:24:26 +05:30
Deepesh Garg
41a6548acb fix: Label and dependes on fixes in Bank Account (#19245) 2019-10-04 16:22:00 +05:30
Pranav Nachanekar
911e034d1c fix: syntax error 2019-10-04 15:50:02 +05:30
Pranav Nachanekar
0082b78075 fix:incosistent tabs and spaces 2019-10-04 15:36:36 +05:30
Pranav Nachanekar
bfe18d6085 feat:assign appointments from opportunity 2019-10-04 14:41:54 +05:30
Shivam Mishra
ba2faecdc7 fix: null check for valuation rate (#19195) 
* fix: null check for valuatiomn rate

* fix: add rate for item in test records

* refactor: use flt instead of throwing error

* Revert "fix: add rate for item in test records"

This reverts commit f8cebe65f5fe32382aba842f765d263511cbb082.
 2019-10-04 11:58:04 +05:30
Pranav Nachanekar
c1bc0f9dfb fix: added sections for settings 2019-10-04 11:36:53 +05:30
Pranav Nachanekar
25148d0de5 fix:readability 2019-10-04 11:32:39 +05:30
Pranav Nachanekar
9e36a9ee04 fix: move enable check to serverside 2019-10-04 11:28:29 +05:30
Pranav Nachanekar
faf39ecef4 fix:removed print statements 2019-10-04 11:12:50 +05:30
Pranav Nachanekar
22189ec9e8 remove unnecessary doctype 'Timezone' 2019-10-04 11:07:04 +05:30
Deepesh Garg
8b741cfefb
Merge pull request #19228 from Mangesh-Khairnar/fix-stock-ageing-report 
fix(stock-ageing): filter none values from the fifo queue
 2019-10-04 09:00:13 +05:30
Deepesh Garg
894604201b
Merge pull request #19242 from thefalconx33/git-issues 
fix: ‘EmployeeAdvance’ object has no attribute ‘conversion_rate’
 2019-10-03 22:39:04 +05:30
Mangesh-Khairnar
9351313186 Merge branch 'develop' of https://github.com/frappe/erpnext into fix-stock-ageing-report 2019-10-03 19:21:17 +05:30
Mangesh-Khairnar
ea70c6f696 fix: dynamically filter fifo queue 2019-10-03 19:19:42 +05:30
Pranav Nachanekar
a1d39cab21 fix: travis 2019-10-03 18:26:02 +05:30
Pranav Nachanekar
d40c020e0e fix:variable names 2019-10-03 17:43:31 +05:30
Pranav Nachanekar
bec88bc52a fix: exists return tuple not string 2019-10-03 16:58:38 +05:30
Pranav Nachanekar
afe52e8e09 feat: add check for toggling the route 2019-10-03 16:35:08 +05:30
Pranav Nachanekar
72aac09d62 fix:remove tearDown from test 2019-10-03 16:09:50 +05:30
Pranav Nachanekar
43331564b4 fix:class variable in tests 2019-10-03 15:29:09 +05:30
Pranav Nachanekar
42cf5f279f fix:added class variables to test 2019-10-03 14:26:21 +05:30
Pranav Nachanekar
8640a01f85 remove duplicate day validation 2019-10-03 13:32:57 +05:30
Pranav Nachanekar
1dccc039b7 fix:add tear down to tests 2019-10-03 13:32:46 +05:30
Pranav Nachanekar
59c543570a feat: made timeslots into flex 2019-10-03 13:18:13 +05:30
thefalconx33
4723da0251 fix: #19239 2019-10-03 13:06:43 +05:30
Pranav Nachanekar
76cbb9132f fix: more test errors 2019-10-03 12:50:55 +05:30
Pranav Nachanekar
4856645b6d fix:styling for time-slot 2019-10-03 12:45:42 +05:30
Pranav Nachanekar
c5420bb453 fix: remove validation for repeated days 2019-10-03 12:06:43 +05:30
Pranav Nachanekar
93670fedda timezone manipulation using pytz 2019-10-03 11:58:02 +05:30
Pranav Nachanekar
1dcedb5054 fix: empty leads and appointment in test 2019-10-03 11:56:54 +05:30
Pranav Nachanekar
c6da5fb38e fix:guess timezone using moment 2019-10-03 11:56:23 +05:30
rohitwaghchaure
f4245a2d9c minor: show BOM related operations (#19237) 2019-10-03 11:41:36 +05:30
gavin
be8f6f0d65 fix: report ~ lead conversion time (#19232) 2019-10-03 11:36:04 +05:30
Frappe PR Bot
045ca33692 feat: Updated translation (#19227) 2019-10-03 11:15:41 +05:30
Himanshu
c18b54fc08
Merge branch 'develop' into global_search_modules 2019-10-02 16:39:38 +05:30
Sahil Khan
c5a6e9da15 Merge branch 'develop' into version-12 2019-10-02 16:36:54 +05:30
Sahil Khan
80ed98c87a bumped to version 12.1.6 2019-10-02 16:56:54 +05:50
Himanshu
2985cffc52
Merge branch 'develop' into global_search_modules 2019-10-02 16:36:19 +05:30
Himanshu Warekar
2935751f75 Merge branch 'global_search_modules' of https://github.com/hrwx/erpnext into global_search_modules 2019-10-02 16:34:19 +05:30
Himanshu Warekar
23c916c0d6 fix: global search dict in hooks 2019-10-02 16:32:53 +05:30
Saurabh
039679cad1
Merge branch 'develop' into shopify 2019-09-30 19:08:44 +05:30
Chinmay Pai
5dfc74c851 fix(amazon-mws): python3 compatibility changes (#19210) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-30 16:59:58 +05:30
Chinmay Pai
9d26c69c4a fix(amazon-mws): python3 compatibility changes (#19209) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-30 16:59:42 +05:30
DeeMysterio
20194c4cc5 rename return/invoice to Purchase return/invoice (#19212) 2019-09-30 16:59:15 +05:30
Rohan
d463c346fe fix: set no-copy on some contract fields (#19208) 2019-09-30 16:37:29 +05:30
Nabin Hait
25e043766a
fix: Get leave approvers in Employee leave balance report (#19211) 2019-09-30 16:36:23 +05:30
Mangesh-Khairnar
905573700b feat(report): fixed asset register (#19164) 
* feat(report): fixed asset register

* fix: fetch supplier and check for asset status

* fix: fetch vendor name from purchase invoice

* style(fixed-asset-register): use conventional column name

* Update fixed_asset_register.py
 2019-09-30 16:10:46 +05:30
Himanshu
37f4316df0
Update setup_wizard.py 2019-09-30 16:02:24 +05:30
Marica
de15cc1387 fix: Work order dialog box 'Select Quantity' on clicking 'Finish' (#19136) 
The dialog box fetched 0 as Quantity to Manufacture and Max Quantity on finishing a Work Order
 2019-09-30 15:36:33 +05:30
Pranav Nachanekar
2ea9b3e6f2 fix:test appointments 2019-09-30 15:35:38 +05:30
rohitwaghchaure
8d889ef80e fix: update the pending qty in production plan on completion of work order (#19180) 2019-09-30 15:22:12 +05:30
Deepesh Garg
b54f0fb388 fix: Party column empty in accounts receivable/ payable summary (#19205) 2019-09-30 15:19:56 +05:30
Suraj Shetty
1da81d8755
Merge pull request #19206 from hrwX/disp_mobile_no 
fix: Show primary mobile no
 2019-09-30 15:18:01 +05:30
Suraj Shetty
b093ea1f0a
feat: Remove Leaderboard from ERPNext (#19156) 
feat: remove Leaderboard from ERPNext
 2019-09-30 15:17:26 +05:30
rohitwaghchaure
ed1cc18ab5 fix: stock ledger report not showing data if the UOM filter has selected (#19179) 2019-09-30 15:15:52 +05:30
Marica
147af15268 fix: Added 'Manual' % Complete Method in Project (#19175) 
Added additional '% Complete Method' in Project so that Project can be set to 'Completed' irrespective of presence of Tasks
 2019-09-30 15:11:15 +05:30
prssanna
1f512b36c5 fix(patch): set app_type as private 2019-09-30 14:57:21 +05:30
hrwx
ebc0e1ca8a fix: remove return statement 2019-09-30 14:56:39 +05:30
hrwx
bf09fbe6b9 fix: sku 2019-09-30 14:56:39 +05:30
hrwx
5c036d9aaf fix: permissions 2019-09-30 14:56:39 +05:30
hrwx
5aa8743024 changes 2019-09-30 14:56:39 +05:30
prssanna
c6b7695ab5 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
c8ad8bb7aa fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
09f4e0b19c fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
a9aac02b90 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
e64bdcd12b fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
f380b215b2 fix: shopify integration 2019-09-30 14:56:39 +05:30
Himanshu
201bcaf2ca fix(Company): Do not set default account if left blank (#19131) 
* chore: use dict to set_default_account

* fix: dont override expense account if left empty

* fix: set accounts only if new company

* chore: fix alignment

* fix: test cases
 2019-09-30 14:56:08 +05:30
Himanshu
7d6f52f4ab fix: add system user perm in patient (#19133) 2019-09-30 14:40:56 +05:30
Mangesh-Khairnar
d8763d7d65 fix: allow rename/merge in opportunity (#19202) 2019-09-30 14:39:46 +05:30
Himanshu Warekar
46831c4c20 fix: show mobile no 2019-09-30 14:34:56 +05:30
Pranav Nachanekar
7f4bc64d22 fix:appointment tests exist check 2019-09-30 13:58:42 +05:30
Himanshu
32b587b3a0
Merge branch 'develop' into global_search_modules 2019-09-30 13:44:42 +05:30
Himanshu Warekar
21abc3aa50 fix: add doctypes for modules 2019-09-30 13:40:02 +05:30
Suraj Shetty
4c3f0b94a4
Merge branch 'develop' into leaderboard 2019-09-30 13:11:19 +05:30
Suraj Shetty
fcb6edf571 Merge branch 'leaderboard' of github.com:prssanna/erpnext into leaderboard 2019-09-30 13:09:53 +05:30
Suraj Shetty
d23c9987ed style: Fix Codacy 2019-09-30 13:09:12 +05:30
Rohan
60b852bb12
Merge branch 'develop' into dev-work-order-bugs 2019-09-30 13:08:12 +05:30
Rohan
c86cdd609e
Merge branch 'develop' into dev-serial-no-statuses 2019-09-30 13:08:10 +05:30
Deepesh Garg
91aa671a23
Merge pull request #19137 from marination/invoice-discounting 
fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
 2019-09-30 12:43:09 +05:30
Suraj Shetty
6bd4509923
Merge branch 'develop' into leaderboard 2019-09-30 12:35:39 +05:30
Rucha Mahabal
34326470b8 fix: produced_qty field hidden and not updated in sales order item (#19037) 
* fix: produced_qty field hidden and not updated in sales order item

* fix: added patch for old sales orders

* fix: produced_qty for sales order item linked to multiple work orders

* fix: comment

* fix: function for updating produced_qty in SO Item

* fix: remove frappe.db.commit
 2019-09-30 12:15:39 +05:30
Suraj Shetty
38794c0ca1
Merge branch 'develop' into leaderboard 2019-09-30 11:54:28 +05:30
prssanna
b874922404 fix: whitelist leaderboard functions 2019-09-30 11:12:10 +05:30
Deepesh Garg
296bf9ef42 chore: Add standard chart of accounts template for El Salvador (#19151) 
* chore: Add standard chart of accounts template for El Salvador

* fix: Renane template file
 2019-09-30 11:02:49 +05:30
Deepesh Garg
7b1b3f0fa8 fix: Allow alternative item in stock entry while transfering material to subcontractor (#19189) 2019-09-30 11:01:05 +05:30
Rucha Mahabal
3564ac7c88 fix: don't create debit/credit note automatically (#19185) 2019-09-30 10:59:28 +05:30
DeeMysterio
5ef26b42a8 feat(delivery note): make the delivery trip plus button fetch data from delivery note (#19046) 2019-09-30 10:57:32 +05:30
Roland
6edce82aef do not require address in webshop (#19096) 
fix: #17559 - in webshop adding address should not be mandatory e.g. for online service goods, button to add address remains available
 2019-09-30 10:56:22 +05:30
Rohan
e19e16fbf1 fix: remove internal fields from print (#19101) 2019-09-30 10:54:01 +05:30
Nabin Hait
2a10b02c68
Merge branch 'develop' into invoice-discounting 2019-09-30 10:10:50 +05:30
Himanshu
25ab1e41df fix(Contact): mobile_no re-introduced and travis fixes (#19009) 
* fix: mobile_no re-introduced

* fix: test cases

* fix: set email as primary

* fix: add primary email and phone

* fix: utils for contact creation

* chore: remove = from dict
 2019-09-30 10:08:15 +05:30
Mangesh-Khairnar
77f22635f2 fix(stock-ageing): filter none values from the fifo queue 2019-09-27 17:50:52 +05:30
prssanna
119c976ad1 fix: missing comma 2019-09-27 16:28:08 +05:30
prssanna
8f7ed71e9e fix: add df to leaderboard config 2019-09-27 15:09:40 +05:30
Himanshu
83b0b2adec feat(Global Search): Add fixtures for global search (#19049) 2019-09-27 00:59:48 +05:30
Mangesh-Khairnar
a01ebe0a54
Merge branch 'develop' into rename-job-applicant 2019-09-26 18:41:28 +05:30
Nabin Hait
001edb4464
refactor: Reposting utility of Stock ledger (#19155) 2019-09-26 16:44:35 +05:30
sahil28297
a9ff4f6688
fix(Report): Sales Register 2019-09-26 13:58:00 +05:30
prssanna
d095acdad5 fix: use orm for queries 2019-09-26 13:41:24 +05:30
Shivam Mishra
8781dc8ca3 fix: footer link redirect to landing pages (#19181) 2019-09-26 12:53:52 +05:30
Mangesh-Khairnar
f82ea857a0 feat(job-applicant): allow rename/merge with existing 2019-09-26 12:29:41 +05:30
Marica
54becbb33a
fix: Codacy fix(whitespaces) 2019-09-26 11:24:34 +05:30
marination
a877115ff4 fix: Minor changes 
Added value in fetch from and removed client side code
 2019-09-26 11:08:39 +05:30
marination
e7f67592a8 fix: Made outstanding amount field read only and added validation 
Made the field editable so that outstanding amount can be adjusted
 2019-09-26 10:58:02 +05:30
marination
ed004018d6 fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting 
It wrongly fetched grand total from sales invoice instead of outstanding amount.
 2019-09-26 10:58:02 +05:30
Deepesh Garg
d138633c5b
Merge pull request #19163 from thefalconx33/small-fixes 
fix: Supplier field not getting populated in serial no on creation of asset
 2019-09-25 22:09:41 +05:30
Marica
23d7b09389 fix: Item Rate within Update Items in Sales order (#19172) 
Blocked negative discount percentage, which affected the item rate every time Update Items action was taken
 2019-09-25 17:17:36 +05:30
Rucha Mahabal
132323462c fix(Report): Sales Register (#19166) 2019-09-25 16:03:45 +05:30
Pranav Nachanekar
fd46bf2616 fix codacy 2019-09-25 16:01:48 +05:30
Pranav Nachanekar
774167192a Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-25 13:12:32 +05:30
Pranav Nachanekar
291e161793 Added permissions for sales user 2019-09-25 13:11:04 +05:30
Nabin Hait
2064dfc5a9
fix: Handling payments against credit/debit notes and party currency (#19154) 2019-09-24 19:52:33 +05:30
Mangesh-Khairnar
1e6e1dd451 enhancement(tds-monthly-payable): remove zero value transaction (#19141) 2019-09-24 19:46:06 +05:30
Rucha Mahabal
c6b548b5b2 fix(Stock): item variant description (#19134) 2019-09-24 19:17:13 +05:30
gavin
fed5788c50 fix: patch fix (#19147) 2019-09-24 19:15:29 +05:30
Rucha Mahabal
824376a045 fix(Journal Entry): Opening Entry not fetching accounts (#19148) 2019-09-24 19:13:55 +05:30
Saqib
451d1a1744 fix: Bypass credit limit and Project Template field not visible(#19162) 
* Fix: Allow Project Template in Quick Entry

* Fix: Label Changes
 2019-09-24 19:10:59 +05:30
thefalconx33
c15cc8fc28 fix: #18624 2019-09-24 18:49:16 +05:30
Sahil Khan
946f68f7f0 bumped to version 12.1.5 2019-09-24 18:36:53 +05:50
Vijaya Raghavan
e9affd97ac
LWP for half day in multi day leave 2019-09-24 17:04:32 +05:30
Pranav Nachanekar
9f86022c2b fix: Error in test setUp 2019-09-24 16:07:41 +05:30
Pranav Nachanekar
d45c12b382 Formatting 2019-09-24 16:07:02 +05:30
prssanna
3f1444e410 fix: get leaderboards using hooks 2019-09-24 13:51:22 +05:30
prssanna
3bd15d3aaa feat: remove leaderboard from erpnext 2019-09-24 13:06:31 +05:30
Pranav Nachanekar
c9cf5aebea Changed required values, add clientside validation 2019-09-24 12:08:37 +05:30
Rohan
a51a304cf0
Merge branch 'develop' into dev-work-order-bugs 2019-09-24 11:53:00 +05:30
Nabin Hait
7ab861fe95
Merge branch 'develop' into develop 2019-09-24 11:50:38 +05:30
Nabin Hait
786d7bd3d4
Merge branch 'develop' into dev-serial-no-statuses 2019-09-24 11:50:33 +05:30
Deepesh Garg
d9e9d562f8 fix: Travis (develop) (#19140) 
* fix: Travis

* fix: Syntax Error
 2019-09-24 11:44:52 +05:30
Pranav Nachanekar
558d44e519 Removed auto-assignment for unverified appointments 2019-09-24 11:33:57 +05:30
Deepesh Garg
2e7419d78f fix: Do not validate warehouse in case of Repack (#19050) 2019-09-24 10:05:42 +05:30
Himanshu
fdad33309b fix: get correct warehouse for product bundle (#19130) 2019-09-24 10:03:34 +05:30
Anurag Mishra
5a61880e6a fix: provided delete permission (#19143) 2019-09-24 09:54:54 +05:30
Mangesh-Khairnar
5dcf2c669f chore: remove unlinked letter head references (#19138) 2019-09-24 09:53:06 +05:30
Pranav Nachanekar
8393ebbbca Fixed missing permission in update 2019-09-23 17:14:31 +05:30
Pranav Nachanekar
8b744b2d03 Added request verification and url encoding 2019-09-23 15:55:35 +05:30
rohitwaghchaure
8dd4699f10 feat: Allow to make landed cost voucher against the asset item (#19121) 2019-09-23 15:03:52 +05:30
rohitwaghchaure
e18f7b91c3
Merge pull request #19127 from rohitwaghchaure/removed_mandatory_property_for_address_field_in_quick_entry_develop 
fix: removed mandatory property for address field in quick entry
 2019-09-23 14:48:27 +05:30
Pranav Nachanekar
a35e34b5f0 FIxed typos and create_lead method 2019-09-23 14:38:22 +05:30
Pranav Nachanekar
3eccb84eaa Fixed update method 2019-09-23 14:25:42 +05:30
Pranav Nachanekar
b6b27d9256 Corrected moving to doctype for email 2019-09-23 14:16:13 +05:30
Pranav Nachanekar
7b7962d28c Added test cases 2019-09-23 13:05:18 +05:30
Pranav Nachanekar
dcfc849946 Moved email to appoitnmetn doctype 2019-09-23 11:52:26 +05:30
Pranav Nachanekar
f8cc86bfed Moved email from class variable to doctype 
Formatting
Made methods which link other doctypes idempotent
 2019-09-23 11:28:05 +05:30
Pranav Nachanekar
0800031c0d Addee email to appointment doctyoe 
and asthetic changes
 2019-09-23 11:26:46 +05:30
Pranav Nachanekar
6b0fea16b6 Added buttons to linked docs 2019-09-23 11:26:18 +05:30
Anurag Mishra
2c60f6419e feat: missmatching amount in GST Sales report and itemised sales report (#19116) 2019-09-20 23:00:09 +05:30
Suraj Shetty
462d9cb331 feat: "Purchase Order items to be Received or Billed" report (#19091) 
* feat: Init "Purchase Order items to be received or billed" report

* fix: Rename report

* fix: Column name
 2019-09-20 18:30:22 +05:30
Mangesh-Khairnar
a44e8afe71 feat: add bank account in payroll entry (#19021) 
* fix(journal-entry): change fieldname from bank account no to bank account

* fix: add payroll entry in bank dashboard

* fix: fetch account from bank account

* fix: minor changes

* patch: check for bank account no column before updating

* fix: use rename field function
 2019-09-20 18:19:47 +05:30
Sahil Khan
0c665e5638 bumped to version 12.1.4 2019-09-20 15:37:21 +05:50
Rohit Waghchaure
1f9a84f165 fix: removed mandatory property for address field in quick entry 2019-09-20 12:18:23 +05:30
Pranav Nachanekar
9c0f462336 Fixed Syntax errors 2019-09-20 10:51:56 +05:30
Pranav Nachanekar
aa7d0c0163 Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-20 10:47:18 +05:30
Pranav Nachanekar
73420e462f Added email 2019-09-20 10:44:52 +05:30
Pranav Nachanekar
fa4a2a53e8 Added email 2019-09-20 10:41:59 +05:30
Pranav Nachanekar
df1a5a9633 Added flow for verifying emails 2019-09-20 10:08:48 +05:30
Pranav Nachanekar
5324234bd0 Removed required lead 2019-09-20 10:08:26 +05:30
rohitwaghchaure
30f3354a7a
Merge pull request #19114 from marination/report-fix 
fix: Report 'Payment Period based On Invoice Date'
 2019-09-19 19:01:05 +05:30
Anurag Mishra
c16fb9eb9d
fix: dashboard button not working (#19094) 2019-09-19 18:12:39 +05:30
rohitwaghchaure
6bbc834f8f
Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue 
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…
 2019-09-19 18:01:03 +05:30
marination
8590112faa fix: Report 'Payment Period based On Invoice Date' 2019-09-19 17:48:23 +05:30
Rohit Waghchaure
6daab3ca89 fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given) 2019-09-19 17:01:49 +05:30
Rucha Mahabal
51eabfe352 fix: subcontracting material transfer dialog in Purchase Order (#19111) 
* fix: subcontracting material transfer dialog in Purchase Order

* fix: dialog title
 2019-09-19 16:57:03 +05:30
Mangesh-Khairnar
68a4c70b72
Merge branch 'develop' into attendance_template_fix 2019-09-19 13:34:39 +05:30
Pranav Nachanekar
ca2509423a Added permissions for HR manager 2019-09-19 12:36:51 +05:30
Pranav Nachanekar
4109f88c04 Linked send_reminder in calendar event 
to Appointment Booking Settings
 2019-09-19 12:08:10 +05:30
Pranav Nachanekar
5bf52ebed6 limit assigment load to appointment day 2019-09-19 11:47:54 +05:30
Pranav Nachanekar
ba99945359 Prevent booking of appointments for past times 2019-09-19 11:21:05 +05:30
Suraj Shetty
28d182af15 fix: Permission issue in Total Stock Summary report (#19110) 
Data in "Total Stock Summary" report were not getting filtered
based on applied user permissions because some link fields had
wrong options
 2019-09-19 11:13:22 +05:30
Rohan
8a097c8627 fix: only set times if job card is filled (#19107) 2019-09-18 20:05:49 +05:30
Rucha Mahabal
1ba83427e5 fix: asset maintenance TypeError during date comparisons (#19098) 2019-09-18 20:04:15 +05:30
Marica
d793e39b6d fix: Customer Credit Balance Report query fix (#19104) 2019-09-18 19:59:31 +05:30
Pranav Nachanekar
ec1dae023c styling 2019-09-18 16:13:29 +05:30
Pranav Nachanekar
7d476a3e35 Moved lead assignment to the controller 2019-09-18 15:33:31 +05:30
Pranav Nachanekar
81449ece54 fix:Linking lead 2019-09-18 14:33:40 +05:30
Pranav Nachanekar
7323bfdad7 Styling and bug fixes 2019-09-18 14:33:10 +05:30
Rohan
b9c1dad2e6
Merge branch 'develop' into dev-serial-no-statuses 2019-09-18 13:24:28 +05:30
Rucha Mahabal
aeaf416d6d fix: upload attendance template not marking attendance 2019-09-18 13:11:30 +05:30
Pranav Nachanekar
3c8bea65ef Merged with local 2019-09-18 10:39:11 +05:30
Pranav Nachnekar
57c311f8e9
Merge branch 'develop' into develop 2019-09-18 10:33:39 +05:30
rohitwaghchaure
780fb8a4e5 fix: set stock adjustment account for the raw materials instead of COGS (#19090) 2019-09-17 18:46:49 +05:30
rohitwaghchaure
d019d28bc9 fix: Customer Ledger Summary report not working on python 3 (#19092) 2019-09-17 18:45:59 +05:30
Sahil Khan
4f96ec1b6c bumped to version 12.1.3 2019-09-17 17:31:14 +05:50
sahil28297
c1930fa64d
Merge branch 'develop' into fix_indentation 2019-09-17 17:08:16 +05:30
Pranav Nachanekar
91a564989f Styling and PR review changes 2019-09-17 16:58:41 +05:30
kaviya
9e4f674fb9 fix: indentation error in stock ageing 
fixes https://travis-ci.com/frappe/erpnext/jobs/235815591#L1720
 2019-09-17 16:02:11 +05:30
Suraj Shetty
627a3dcd6d feat: Default energy point rules (#19003) 
* feat: Add default energy point rules during install

* fix: Add completed_by field to task doctype

* fix: Rule data

* fix: Add default rules for opportunity

* fix: Add a patch to create default energy point rules

* fix: Default success action message

* fix: Use .items() instead of .iteritems()

* fix: Add "create_default_energy_points" patch entry

* fix: Reload Energy Point Rule to fix patch

* fix: Import frappe
 2019-09-17 15:54:41 +05:30
Suraj Shetty
af2eac4334 fix: Create error log if something goes wrong while call log creation (#19055) 
* fix: Create error log if something goes wrong while call log creation

- For better debbugging

* fix: Rollback if any error occurs during call log creation
 2019-09-17 15:53:23 +05:30
Pranav Nachnekar
33daf281bd
Merge branch 'develop' into develop 2019-09-17 14:14:16 +05:30
Suraj Shetty
7563bdf6f8
Merge branch 'develop' into fix-exotel-call-log 2019-09-17 13:28:59 +05:30
rohitwaghchaure
ad5fc07652
Merge pull request #19084 from rohitwaghchaure/offline_pos_currency_conversion_issue_for_v11 
fix: plc conversion issue for offline pos
 2019-09-17 13:24:41 +05:30
Suraj Shetty
6b9b92afb0 fix: Return employee emails instead of employee 2019-09-17 13:22:40 +05:30
Rohit Waghchaure
094612dc02 fix: plc conversion issue for offline pos 2019-09-17 13:04:28 +05:30
Faris Ansari
4fe67236ed fix: Python 3 fixes for MWS Connector (#18986) 2019-09-17 12:57:51 +05:30
Deepesh Garg
c5c3860c5c fix: Mandatory accounting dimensions while creating asset depreciation entry (#19073) 
* fix: Mandatory accounting dimensions while creating asset depreciation entry

* fix: Consider account types while assigning accounting dimensions
 2019-09-17 12:50:28 +05:30
rohitwaghchaure
6de526ff42 fix: not able to change the account type in parent company account head (#19083) 2019-09-17 12:49:52 +05:30
Mangesh-Khairnar
5d41e3848d fix: do not submit depreciation journal entry when workflow is enabled (#19000) 2019-09-17 12:45:14 +05:30
Pranav Nachnekar
a8752db012
Typo and styling fixes 
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-09-16 20:02:20 +05:30
Frappe PR Bot
abd434f656 feat: Updated translation (#19077) 2019-09-16 19:57:27 +05:30
Suraj Shetty
bc001d2d9a feat: Add stock ageing data to stock balance report (#19036) 
* feat: Add stock ageing data to stock balance report

* fix: Use fifo queue warehouse wise

* fix: "Stock Ledger Entry" get query

* fix: Remove unwanted quotes in item details query

* fix: Check if no SLE was passed

* fix: Codacy

* fix: Add logic to include additional UOM columns

* fix: Show stock ageing data optionally
 2019-09-16 19:57:04 +05:30
Nabin Hait
b50b5095ad
fix: Added field disabled instead of enabled in cost center (#19065) 2019-09-16 19:44:37 +05:30
Marica
bac4b93639 fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master (#19066) 
Manufacturer Link field options in Items Table of transactions will also display manufacturer part no.
Manufacturers table in Item master will check for duplicate entries.
 2019-09-16 19:44:28 +05:30
rohitwaghchaure
76df782006 fix: Decimal point issue for e-invoice (#19068) 2019-09-16 19:43:17 +05:30
Mangesh-Khairnar
dce04b7335 fix: filter for payment order (#19070) 2019-09-16 19:40:27 +05:30
Chinmay Pai
7e8e4783a1 fix: remove function call from kwarg (#19072) 
this commit fixes mail not being sent for leave applications

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-16 19:14:42 +05:30
Rohit Waghchaure
40c5bf9e94 fix: naming series added in the asset movement 2019-09-16 16:42:42 +05:30
Faris Ansari
8beca68948 feat: Scan Barcode using Camera in mobile (#19033) 
* feat: Scan Barcode using Camera in mobile

* fix: Use input-group for scan button

* fix: Muted camera button
 2019-09-16 15:20:10 +05:30
Rucha Mahabal
2818b5bbe7 fix: 'link to material request' button not showing any message if no Material Request found (#19064) 2019-09-16 15:16:38 +05:30
Deepesh Garg
8cc2f83bd5 fix: Fetch scrap items from BOM if purpose is repack (#19056) 2019-09-16 14:49:12 +05:30
Nabin Hait
57835f0a37
fix: Company is required to get bin details (#19058) 2019-09-16 14:48:16 +05:30
Rushabh Mehta
72dcb51177 fix(minor): opportunity_from may not be selected (#19063) 2019-09-16 14:47:43 +05:30
Sammish Thundiyil
a2a9b39794 modified: erpnext/accounts/doctype/account/account.json (#19032) 2019-09-16 13:29:25 +05:30
Nabin Hait
c2a9b14c96
fix: Invalid reference doctypes for accounting dimensions (#19027) 
* fix: Invalid reference doctypes for accounting dimensions

* fix: Add server side validation for accounting doctypes

* fix: set fieldname and label before insert
 2019-09-16 13:26:37 +05:30
Nabin Hait
4432a874de
Merge branch 'develop' into dev-work-order-bugs 2019-09-16 13:10:47 +05:30
Nabin Hait
74fdfff5b5 fix: Set todo status as Closed if task completed (#19059) 2019-09-16 13:06:37 +05:30
rohitwaghchaure
87000977d5
Merge pull request #19061 from rohitwaghchaure/user_can_edit_rate_and_discount_in_offline_pos_develop 
fix: user can able to change rate and discount even if they don't have permissions
 2019-09-16 11:50:52 +05:30
Rohit Waghchaure
a9435cc6b0 fix: user can able to change rate and discount even if they don't have permission 2019-09-16 11:15:22 +05:30
barredterra
5bd8562b5a Merge branch 'develop' into datev_report_headers 2019-09-14 20:09:39 +02:00
rohitwaghchaure
4a323463f7 fix: for pos, paid amount has not considered the tax amount due to which outstanding amount showing for the pos invoices (#19039) 2019-09-13 18:36:57 +05:30
Deepesh Garg
9c3fd8dbc3
Merge pull request #19044 from marination/gstr-error 
fix: Changed error message in GSTR-1 Report
 2019-09-13 18:04:38 +05:30
Pranav Nachanekar
018f0d3bbd Fixed issue: agents weren't looked up in settings 2019-09-13 16:52:06 +05:30
marination
3d433efdfe fix[minor]: Changed error message in GSTR-1 Report 
Error message didn't prompt where the user has to add the missing value(GSTIN No.)
 2019-09-13 16:28:11 +05:30
Pranav Nachanekar
1cd762e9d0 Added ajuto assignment 2019-09-13 15:56:54 +05:30
Pranav Nachanekar
d88f850d0f removed debugger 2019-09-13 15:56:47 +05:30
Pranav Nachanekar
cf045d86b0 fixed typo 2019-09-13 15:55:54 +05:30
Nabin Hait
93a9c08116
fix: Allocate payment amount in reference table on change of payment amount (#19041) 2019-09-13 15:48:50 +05:30
Chinmay Pai
b3c732daf5 refactor(plaid): move configuration from site_config to doctype (#18712) 
* feat(plaid): move plaid from site_config to doctype

plaid requires accessing site_config and cloud users cannot access
site_config and hence, plaid integration doesn't work on the cloud.
Moving all the configuration from site_config to the Plaid Settings
doctype fixes this issue.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* feat(plaid): make changes to plaid_settings and add patch

* remove all references for get()-ing plaid variables from frappe.conf
  and replace them with values from doctype
* add patch to move all existing plaid settings variable values from
  frappe.conf to plaid_settings doctype

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix(plaid): use get_single_value for Plaid Settings

Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>

* chore: reload plaid_settings before running patch

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove useless semicolon

fuck codacy

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-13 15:48:08 +05:30
Suraj Shetty
f8899827e0 fix: Add Exotel Settings to integration module (#19025) 
* fix: Add Exotel Settings to integration module

* fix: Add description
 2019-09-13 12:27:00 +05:30
Suraj Shetty
6996c2d17d fix: Fetch image from user if available (#19030) 2019-09-13 12:25:06 +05:30
Mangesh-Khairnar
755020843b fix: leave balance reports (#18984) 
* fix: process allocation expiry

* fix: leave balance summary filter

* fix: opening and closing balance

* fix: check for department leave approvers

* fix: minor changes

* fix: consider leave approver in employee

* Update employee_leave_balance_summary.py
 2019-09-13 11:07:09 +05:30
Rucha Mahabal
72949e7f73 fix: share transfer validations for journal entry (#19018) 
* fix share transfer validations for journal entry

* fix: share transfer test

* fix: tests
 2019-09-13 11:05:40 +05:30
Suraj Shetty
cdce6c746f fix: Make -> Create 2019-09-12 22:04:49 +05:30
Himanshu
d51f7af9ab fix: add contact phone to sales order (#19012) 2019-09-12 19:19:17 +05:30
Suraj Shetty
3b0ec48b0c fix: Naming series check to avoid duplicate entry error (#19015) 
* fix: Naming series check to avoid duplicate key error

* fix: Check for existence of naming series
 2019-09-12 19:18:44 +05:30
Nabin Hait
a5dfe0725f
fix: payment against shareholder (#19019) 2019-09-12 19:17:24 +05:30
Shivam Mishra
a3095c987a fix: optimized query (#19026) 
Co-authored-by: nabinhait
Co-authored-by: sahil28297 <sahilkhan28297@gmail.com>
 2019-09-12 17:28:37 +05:30
Rohan
a656151ee9 fix: operating cost calculation in JS 2019-09-12 16:00:25 +05:30
Pranav Nachanekar
a3b8c77af1 Fixed leads 2019-09-12 15:19:22 +05:30
Pranav Nachanekar
1564f1476c Added customer to calender event 2019-09-12 14:24:28 +05:30
Pranav Nachanekar
c9c8e19ec2 Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-12 14:13:18 +05:30
Sammish Thundiyil
504e52ff46 refactor: cost center (#19011) 
* 	modified:   erpnext/accounts/doctype/cost_center/cost_center.json

* fix: removed unique property from cost_center_name
 2019-09-12 13:48:41 +05:30
sahil28297
b1604a24ed fix(add_to_cart): show add_to_card button only if specific conditions are satisfied (#19007) 2019-09-12 11:20:55 +05:30
Pranav Nachanekar
469247bf73 Change max date of datepicker 
to number of days in future as specified by the settings
 2019-09-12 11:15:42 +05:30
Pranav Nachanekar
a2dbd391b3 Add lead and calender event to appointments 2019-09-12 10:48:26 +05:30
Pranav Nachanekar
8051ca1859 Limit advance booking of appointments 2019-09-12 10:47:45 +05:30
Himanshu
e3ef56804c fix(Issue): track split from in issue (#18994) 
* fix: track split from in issue

* fix: rename field name

* fix: remove first_mins to response
 2019-09-11 19:20:20 +05:30
Fisher Yu
cd38ba4833 fix: several bugs and improvement ideas for education module #18599 (#18600) 
* Update student_report_generation_tool.py

bug fix

* Update student_applicant.json

* Update program_course.json

* Update course_activity.json
 2019-09-11 19:10:39 +05:30
Nabin Hait
1d1858a8b0
Show draft future payments as well 2019-09-11 18:39:49 +05:30
Pranav Nachanekar
249cdd92e0 Added uniqueness check for offset 2019-09-11 14:59:25 +05:30
Pranav Nachanekar
e543fc483f Removed email reminders 
As it will be handled by calender event in the future
 2019-09-11 14:59:13 +05:30
Pranav Nachanekar
a322b159ab Added back button from details page 2019-09-11 14:25:26 +05:30
Pranav Nachanekar
0cc837eac5 Create event for the appointment 
TODO: Add lead and employee to this
 2019-09-11 14:12:30 +05:30
Nabin Hait
ff09b412f4
feat: Allowed multiple payment requests against a reference document (#18988) 2019-09-11 12:43:27 +05:30
Pranav Nachnekar
4897897a3a
Merge branch 'develop' into develop 2019-09-11 11:21:26 +05:30
Mangesh-Khairnar
7bcb24efbf fix(purchase-invoice): Update paid amount on creation of debit note (#18830) 
* fix(purchase-invoice): set paid amount for purchase return

* fix(purchase-invoice): remove payment schedule on creation of debit note
 2019-09-11 10:49:33 +05:30
Pranav Nachanekar
5038d6a6db Removed appointment tests 
TODO: Write better tests after adding lead and calender event generation
 2019-09-11 10:31:04 +05:30
rohitwaghchaure
bb736248a2 fix: incorrect qty calculation in the production plan fopr the sub assembely work orders (#18970) 2019-09-11 10:20:49 +05:30
Saurabh
e919388ee6 fix: do not cache value while creating item group, in setup wizard it will raise link validation error (#18992) 2019-09-11 10:07:50 +05:30
rohitwaghchaure
358a01a226 fix: Quotation Trends report not working for filter group by customer (#18989) 2019-09-10 19:18:30 +05:30
Pranav Nachanekar
2d7370a525 Moved delete_appointment 2019-09-10 16:46:17 +05:30
Rohan Bansal
bf7e012bde feat: add statuses for Serial No 2019-09-10 15:55:54 +05:30
Pranav Nachanekar
c4950a0281 Added doctype 
availabitlity of slots added
 2019-09-10 15:10:51 +05:30
Nabin Hait
a035428d43 fix: handling of key does not exists error 2019-09-10 14:51:02 +05:30
Sahil Khan
d2315e5c5c Merge branch 'develop' into version-12 2019-09-10 14:38:39 +05:30
Sahil Khan
a2fd1f22da bumped to version 12.1.2 2019-09-10 14:58:39 +05:50
Sammish Thundiyil
bcda12f4bb modified: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json (#18829) 2019-09-10 14:11:02 +05:30
Shivam Mishra
e851346b4c fix: dont make dashboards if company is not set (#18975) 
* fix: dont make dashboardss if company is not set

* fix: function call

* Update dashboard_charts.py
 2019-09-10 14:08:31 +05:30
Nabin Hait
88e8688a4b
fix: set raw material's batch based on main item's batch only if RM has batch no (#18977) 2019-09-10 14:07:45 +05:30
Suraj Shetty
0254217314 fix: Make address fields mandatory (#18979) 2019-09-10 14:07:05 +05:30
Mangesh-Khairnar
1853a83453 fix(packing-slip): add a descriptive message (#18981) 2019-09-10 13:21:01 +05:30
Pranav Nachanekar
6f486f3719 Addded status to appointment creation 2019-09-10 13:12:28 +05:30
Pranav Nachanekar
5c008ef023 UI Fixes 
Only 8 time slots will appear in a row
Date is more readable on the contact details page
 2019-09-10 13:12:07 +05:30
Pranav Nachanekar
5c211d8abf fixed codacy 2019-09-10 11:52:55 +05:30
Pranav Nachnekar
4ac25f28a3
Merge branch 'develop' into develop 2019-09-10 06:01:33 +00:00
rohitwaghchaure
d312d11062 fix: port from hotfix (#18974) 
* fix: '>' not supported between instances of 'int' and 'str'

* fix: not able to save item because price list has disabled
 2019-09-10 10:47:36 +05:30
Pranav Nachanekar
06facea895 added doctype 2019-09-09 17:09:03 +05:30
Pranav Nachanekar
110f4ea0c9 Formatting 2019-09-09 17:04:25 +05:30
Pranav Nachanekar
db21f86b26 Removed unneccessary doctype 2019-09-09 17:01:40 +05:30
Pranav Nachanekar
20c7c290fa Formatting 2019-09-09 16:36:01 +05:30
Pranav Nachanekar
5945144c08 Added tests 2019-09-09 16:35:48 +05:30
Anurag Mishra
89d3bc0b54 fix: sales invoice return print format overideing the meta default print format 2019-09-09 15:58:25 +05:30
Pranav Nachanekar
10711dd09d Refactor UI 2019-09-09 15:41:20 +05:30
Pranav Nachanekar
63dbacd7c0 Disabled caching 2019-09-09 15:19:57 +05:30
Pranav Nachanekar
48e43e2421 build fix 2019-09-09 14:43:55 +05:30
Pranav Nachanekar
217aadba7e Better autoname 2019-09-09 14:43:41 +05:30
Mangesh-Khairnar
cbcede79b1
Merge pull request #18964 from nabinhait/max_carry_forwarded_leaves 
feat: Added input field for max carry forwarded leaves
 2019-09-09 14:38:06 +05:30
Faris Ansari
32eccb8fb2 fix: Rename duplicate label Image to Website Image (#18912) 2019-09-09 14:29:01 +05:30
Nabin Hait
632fc6af79 feat: Added input field for max carry forwarded leaves 2019-09-09 13:33:00 +05:30
Suraj Shetty
f43825e4dd fix: convert dict to list for iteration (#18963) 2019-09-09 13:23:01 +05:30
Shivam Mishra
5f59c2ae75 fix: reload account timeline before creating dashboards (#18934) 
* fix: sync account balance timeline.json before running patch

* fix: reload account timeline before creating dashboards
 2019-09-09 13:20:53 +05:30
Nabin Hait
fb7c7b53ba feat: Added input field for max carry forwarded leaves 2019-09-09 12:08:58 +05:30
Suraj Shetty
d2f22b52a5
Merge branch 'develop' into employee-leave-balance-summary 2019-09-09 10:21:06 +05:30
MorezMartin
ffc4f8f2a5 feat: [stock -> packed_items] Enable modification of Description on packed items (#18907) 
* Change packed item

* Remove description field on update_packed_items

* add possibility to modify description on packed items
 2019-09-09 10:16:23 +05:30
rohitwaghchaure
cdcff6c26d Multiple port from v11 hotfix (#18954) 
* fix: circular dependency during asset cancellation

* fix: ImponibileImporto for On Previous Row Total

* fix: PrezzoUnitario decimal issue
 2019-09-09 10:15:01 +05:30
Faris Ansari
e352fb754b
fix: Reload doctype in variants patch (#18962) 2019-09-08 21:25:33 +05:30
Suraj Shetty
5ae40a9500
fix: Use absolute import instead of relative import 
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2019-09-08 15:16:35 +05:30
Suraj Shetty
40dbb63042
Merge branch 'develop' into employee-leave-balance-summary 2019-09-08 14:15:47 +05:30
Faris Ansari
594918bd3a
fix: Include Item variant patch in patches.txt (#18961) 2019-09-08 13:13:05 +05:30
deepeshgarg007
366451fc62 fix: Minor fix in GSTR-1 2019-09-08 09:51:15 +05:30
Suraj Shetty
a14ee7f1fe Merge branch 'develop' of github.com:frappe/erpnext into employee-leave-balance-summary 2019-09-07 22:02:02 +05:30
Suraj Shetty
c5588a9b93 fix: Column value and data indentation 2019-09-07 21:26:43 +05:30
Suraj Shetty
21a4f82f69 fix: Re-arrange filters 2019-09-07 20:21:56 +05:30
Nabin Hait
3b366c30a8
feat: Added default Leave Approver in Employee (#18953) 2019-09-07 12:31:07 +05:30
Saurabh
8e67a3a8a8 fix: check if 'All Item Group' exists before settings it as parent_item_group (#18956) 
* fix: check if 'All Item Group' exists before settings it as parent_item_group

* feat: get cached value to avoid db call on each insert
 2019-09-07 12:29:29 +05:30
Nabin Hait
4726fc4893 fix: Deleted unwanted production order files 2019-09-06 15:45:17 +05:30
Shivam Mishra
c69cc13c85 fix: updated footer message (#18949) 2019-09-06 15:40:15 +05:30
Prssanna Desai
ddfbb07c3b fix: fix accounts balance timeline dashboard chart source (#18942) 
* fix: fix accounts balance timeline dashboard chart source

* fix: pass chart_name to get function instead of chart object
 2019-09-06 15:38:06 +05:30
Nabin Hait
d30f87bbdf Merge branch 'Mangesh-Khairnar-feat-customer-credit-limit' into develop 2019-09-06 14:39:59 +05:30
Nabin Hait
4ce38059ac feat: Company wise credit limit 2019-09-06 14:33:10 +05:30
Anurag Mishra
bbc1b5cdcf feat: added date filter based on billing date and based date (#18935) 2019-09-06 12:10:37 +05:30
Anurag Mishra
ac0c1edd23 feat: added date filter based on billing date and based date (#18936) 2019-09-06 12:10:10 +05:30
Marica
a93b665427 fix: Print Format 'Point of Sale' removed from Sales invoice Print Format List (#18937) 
'Point of Sale' Print Format for offline POS ,now doesn't appear in the Print Format Labels List in Sales Invoice for v12.
 2019-09-05 18:26:45 +05:30
Sahil Khan
ede7050afe Merge branch 'develop' into version-12 2019-09-05 17:30:44 +05:30
Sahil Khan
0906bc8430 bumped to version 12.1.1 2019-09-05 17:50:44 +05:50
Nabin Hait
ac2b5ed84f fix: credit limit patch 2019-09-05 16:57:26 +05:30
Nabin Hait
b847731482 Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit 2019-09-05 16:47:08 +05:30
Nabin Hait
b5bd91417d
fix: Print/PDF of AR/AP report after refactoring (#18931) 2019-09-05 16:43:20 +05:30
Himanshu
6298da4458 fix: treeview fixes (#18803) 2019-09-05 16:12:33 +05:30
Deepesh Garg
cffe577028 fix: Add UOM in anlytics report when viewing based on item (#18902) 2019-09-05 16:03:15 +05:30
Raffael Meyer
48d1463825 fix(CoA): SKR04 (#18820) 
- move debitors into receivables
- move creditors into payables
- rename "C - Verb." to "C-Verbindlichkeiten" for consitency
- move "Erlösschmälerungen" into a root of type "Expense"
-  move "Erhaltene Boni" and "Erhaltene Rabatte" into a root of type "Income"
 2019-09-05 15:15:28 +05:30
hendrik
c257ce82c5 Party accounts if don't have default company (#18771) 
Add check for get_default company
 2019-09-05 15:14:09 +05:30
Anurag Mishra
867ac10ffd fix: handle for product bundle (#18420) 
* fix: handle for product bundle

* fix: Requested changes and some general fixes
 2019-09-05 15:13:21 +05:30
KanchanChauhan
d114c8f88f fix(Purchase Order): Status updater (#18612) 2019-09-05 15:11:43 +05:30
Karthikeyan S
1d1427de60 fix(auto attendance): handling None case for IN/OUT Logs (#18867) 2019-09-05 15:02:33 +05:30
Andy Zhu
91596f2467 Change the field name for Payment Entry (#18874) 
In the Payment Entry Form, the field name for customer name is 'party' instead of 'party_name'. 
Need to change the customer_dashboard file accordingly.
 2019-09-05 15:01:38 +05:30
Nabin Hait
eb2ab3bf76
Merge branch 'develop' into develop 2019-09-05 14:59:16 +05:30
John Clarke
a7d448dcba fix: Error "TypeError: unorderable types: int() > str()" When Trying to Create Packing Slip (#18913) 
User report here https://discuss.erpnext.com/t/error-typeerror-unorderable-types-int-str-when-trying-to-create-packing-slip/52445

This has not been noted to github issues and is just a suggested fix, an expert may need to refactor more here?

User and traceback does not state whether Python 2 or 3 but perhaps 3 since that apparently does not 'guess' when types do not match?

See also https://stackoverflow.com/questions/14886881/unorderable-types-int-str
 2019-09-05 14:55:35 +05:30
Rohan
77da3b4347 fix: pull project from task (#18776) 2019-09-05 14:53:43 +05:30
Rohan
9d77e9f719 fix: error while trying to get directions (#18827) 2019-09-05 14:51:22 +05:30
Govind S Menokee
c901d6322c fix(18837): Student creation error (#18838) 
Academic user not able to create student
 2019-09-05 14:50:23 +05:30
rohitwaghchaure
7496548c39 fix: not able to create invoice against patient (#18858) 2019-09-05 14:48:51 +05:30
rohitwaghchaure
f1fab871b8 fix: mismatch between warehouse tree value and warehouse based stock balance report value (#18879) 2019-09-05 14:47:43 +05:30
rohitwaghchaure
5aaf15d145 fix: healthcare practitioner not showing in the dropdown (#18929) 2019-09-05 14:42:28 +05:30
Nabin Hait
16a7ec95dc fix: tax category is optional argument 2019-09-05 13:01:15 +05:30
Suraj Shetty
607a21e02a feat: Init Employee Leave Balance Summary report 2019-09-05 12:42:29 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit 2019-09-05 12:34:34 +05:30
Nabin Hait
f4fde51bba
Update customer.py 2019-09-05 12:33:29 +05:30
Nabin Hait
c78c86663d
Update customer_credit_balance.py 2019-09-05 12:24:37 +05:30
Nabin Hait
7834a0182b
Update move_credit_limit_to_customer_credit_limit.py 2019-09-05 12:22:48 +05:30
sahil28297
1e0b0da7ad fix(patch): add company in filters to get proper parent account (#18905) 2019-09-05 12:21:44 +05:30
Faris Ansari
a2db94761a fix: Honor Shopping Cart Price List (#18885) 2019-09-05 12:19:50 +05:30
rohitwaghchaure
805b8634da fix: incorrect stock value difference when stock move from negative to positive (#18887) 2019-09-05 12:18:33 +05:30
Rohan
1635967c4e fix: attribute error when trying to fetch items (#18900) 2019-09-05 12:16:49 +05:30
Nabin Hait
a5907e17d5
Update accounts_receivable.py 2019-09-04 11:04:27 +05:30
Suraj Shetty
f5bece1afa
Merge branch 'develop' into fix-call-popup 2019-09-04 11:03:58 +05:30
Suraj Shetty
e46c56bfe8 fix: Use medium instead of to number to get schedule 2019-09-04 11:02:52 +05:30
Nabin Hait
561a2e966e
Update accounts_receivable.py 2019-09-04 11:02:48 +05:30
rohitwaghchaure
a9b0c55bcb
Merge pull request #18914 from rohitwaghchaure/pos_search_item_not_working 
fix: offline pos item search not working
 2019-09-04 06:02:34 +05:30
Rohit Waghchaure
93bad51659 fix: offline pos item search not working 2019-09-03 23:29:41 +05:30
Rucha Mahabal
1e2dc2c8f1 feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) (#18647) 
* feat: employee incentive and retention bonus added in additional salary

* fix: added salary component field, logic improved

* fix: codacy review
 2019-09-03 20:45:52 +05:30
Sahil Khan
e8b1c82531 bumped to version 12.1.0 2019-09-03 16:53:06 +05:50
Saurabh
3f8f8d36b7
Merge branch 'develop' into changelog_v12_1_0 2019-09-03 16:25:44 +05:30
Sahil Khan
a70e2bdbc9 fix(change_log): add v12_1_0 changelog 2019-09-03 16:20:01 +05:30
Nabin Hait
1ab75db0ac
refactor: Accounts Receivable / Payable report (#18906) 2019-09-03 16:07:46 +05:30
Nabin Hait
e85c320501
Merge branch 'develop' into feat-customer-credit-limit 2019-09-03 14:20:17 +05:30
Mangesh-Khairnar
cb44f3a7c3 fix(purchase-invoice): add rounded total property setter for purchase invoice (#18841) 2019-09-03 14:18:15 +05:30
Deepesh Garg
c174e4d01a fix: Default message from Payment Gateway Account not fetching (#18848) 2019-09-03 14:17:41 +05:30
pranav nachnekar
d272fd42c9 changed Autoname 2019-09-03 14:16:56 +05:30
pranav nachnekar
c5b2a58669 Added submit fucntionality 2019-09-03 14:16:47 +05:30
Rohan
7fa3f3fe98 fix: include start and end date for contract status (#18866) 2019-09-03 14:16:12 +05:30
pranav nachnekar
a3d04cdbca A 2019-09-03 13:17:35 +05:30
pranav nachnekar
2791054327 Converted to an SPA 2019-09-03 12:04:52 +05:30
pranav nachnekar
eb4fa966b0 Added validation for timezones 2019-09-03 12:04:23 +05:30
pranav nachnekar
ad6151b690 Added guest permissions 2019-09-03 12:04:13 +05:30
pranav nachnekar
64095084e7 Removed end time in favor of appointment duration 2019-09-03 12:03:14 +05:30
Mangesh-Khairnar
4bcc221ee3 Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit 2019-09-02 23:18:56 +05:30
Mangesh-Khairnar
cf901da25d test: create customer credit limit on change 2019-09-02 23:18:36 +05:30
deepeshgarg007
4dd8895133 Merge branch 'contacts-ref' of https://github.com/deepeshgarg007/erpnext into contacts-ref 2019-09-02 17:42:27 +05:30
deepeshgarg007
8666ecc26f fix: Purchase receipt test 2019-09-02 17:41:12 +05:30
Suraj Shetty
152360d999
Merge branch 'develop' into contacts-ref 2019-09-02 16:24:57 +05:30
Mangesh-Khairnar
e7c7a0e648 fix: loan application (#18882) 
* fix: loan application

* Update loan_application.py
 2019-09-02 15:59:44 +05:30
Himanshu
fffdb6f575 feat(Contacts): Multiple Emails in a Contact (#18675) 
* feat: render multiple addresses

* feat: move to newer contacts structure

* fix: iterate over valid variable

* fix: use primary label instead of bold letters

* fix: call popup get contact name from number

* fix: make contact structure  call popup compatible

* fix: query

* fix: add city, state and country

* fix: display address

* fix: get address in single line

* fix: review fixes

* fix: translation strings

* fix: fix query for contacts

* fix: remove references of mobile_no
 2019-09-02 15:57:45 +05:30
Suraj Shetty
063144c514 fix: Check in_patch before adding 'All Item Group' 2019-09-02 15:53:28 +05:30
deepeshgarg007
402d82b4c5 fix: Remove delete_doc from tests 2019-09-02 14:37:18 +05:30
Himanshu Warekar
711d1acffd fix: remove references of mobile_no 2019-09-02 13:31:10 +05:30
Himanshu Warekar
81472e4c08 Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref 2019-09-02 13:21:29 +05:30
Himanshu Warekar
b8f23c2657 fix: fix query for contacts 2019-09-02 13:20:27 +05:30
Suraj Shetty
f33dfc2121
Merge branch 'develop' into contacts-ref 2019-09-02 12:38:45 +05:30
Deepesh Garg
e26b55265f
Merge pull request #18840 from netchampfaris/missing-parent-item-group 
fix: Set default Parent Item Group
 2019-09-02 12:22:49 +05:30
Himanshu Warekar
26dfd5b314 fix: translation strings 2019-09-02 12:21:41 +05:30
Himanshu Warekar
e31c6964f3 Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref 2019-09-02 12:11:15 +05:30
Himanshu Warekar
fd85b1689d fix: review fixes 2019-09-02 12:10:15 +05:30
Suraj Shetty
4a8710ef75
Merge pull request #18611 from surajshetty3416/fix-paid-amount 
fix: Paid amount 0 while creating advanced payment entry
 2019-09-02 08:38:34 +05:30
Suraj Shetty
58e6b67886
Merge pull request #18613 from surajshetty3416/fix-timesheet-creation 
fix(timesheet): Hours automatically used to set 0
 2019-09-02 08:38:12 +05:30
Suraj Shetty
f268562256
Merge branch 'develop' into contacts-ref 2019-09-02 06:32:11 +05:30
Mangesh-Khairnar
86720deeae fix: bypass credit limit check 2019-09-01 10:15:23 +05:30
Suraj Shetty
72bea0dff4 test: Add test to check creation of pick list from multiple sales order 2019-08-31 18:34:25 +05:30
Suraj Shetty
736b5e07cc fix: Maintain the order of Item List 2019-08-31 18:33:23 +05:30
Suraj Shetty
ca58fde552 test: Enable basic tests 2019-08-31 16:58:51 +05:30
Mangesh-Khairnar
bb3cec1556 test: fetch data from customer credit limit 2019-08-31 14:32:07 +05:30
Mangesh-Khairnar
42d0da8f5a Revert "fix: process allocation expiry" 
This reverts commit b654dc0e28.
 2019-08-31 14:28:10 +05:30
Mangesh-Khairnar
dbc69da409 fix: minor fixes 2019-08-31 14:28:02 +05:30
Mangesh-Khairnar
e3bb247868 fix: check column in credit limit 2019-08-31 13:16:14 +05:30
Mangesh-Khairnar
f856b3b559 fix: fetch customer group of the customer 2019-08-31 01:40:58 +05:30
Mangesh-Khairnar
89433b4bea fix: get credit limit 2019-08-30 22:57:51 +05:30
Suraj Shetty
bcfec77e2c style: Use single quotes 2019-08-30 19:44:37 +05:30
Suraj Shetty
744b92d233 fix: Commonify item not available alert 
- Reorganise code
- UX fixes
 2019-08-30 19:39:28 +05:30
Suraj Shetty
0eed0a9abe test: Temporarily comment out tests 2019-08-30 19:12:16 +05:30
Mangesh-Khairnar
b3e5d11e1d fix: multiple fixes 2019-08-30 18:18:48 +05:30
Suraj Shetty
0df38891a1 fix: Update pick list print format 2019-08-30 15:59:35 +05:30
Suraj Shetty
f75481fa23 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-30 15:45:18 +05:30
pranav nachnekar
828fea6d66 formatting and date validation 2019-08-30 10:49:57 +05:30
pranav nachnekar
2cd994977b Better date validation 2019-08-30 10:49:43 +05:30
pranav nachnekar
17906d5599 Added polyfill for datepicker 
for Safari and IE  support
 2019-08-30 10:49:07 +05:30
Suraj Shetty
5e84ce55ae fix: Add is_stock_item filter for item in locations table 2019-08-30 10:01:49 +05:30
Suraj Shetty
effe53d4ae fix: Set default value for qty 2019-08-30 09:52:08 +05:30
Suraj Shetty
88885184dc fix: Show separate button for pick list creation in work order 2019-08-30 09:30:18 +05:30
Suraj Shetty
9641edc562 fix: Set item locations before save 2019-08-29 22:23:13 +05:30
Suraj Shetty
9b42682575 fix: Check parent warehouse for batch as well 2019-08-29 21:14:26 +05:30
Mangesh-Khairnar
dcd5be0d07 patch: move credit limit in customer to child table 2019-08-29 20:53:51 +05:30
Mangesh-Khairnar
c059bc3e36 fix: grid view of customer credit limit 2019-08-29 20:51:31 +05:30
Deepesh Garg
52c61904c8
Merge pull request #18870 from rohitwaghchaure/not_able_to_save_sales_order_develop 
fix: not able to save sales order
 2019-08-29 20:32:06 +05:30
Suraj Shetty
a6ab00162e style: Remove commented code 2019-08-29 20:17:04 +05:30
Suraj Shetty
9e4282e130 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 20:09:55 +05:30
Rohit Waghchaure
13c7e183a6 fix: not able to save sales order 2019-08-29 20:03:52 +05:30
Mangesh-Khairnar
5755d2d32f fix: customer credit limit report 2019-08-29 19:51:38 +05:30
Mangesh-Khairnar
79525327f0 feat: bypass credit limit check 2019-08-29 19:50:23 +05:30
Suraj Shetty
3e11338ed5 fix: Validate count of serial numbers 2019-08-29 19:46:49 +05:30
Mangesh-Khairnar
233ee277ef
Merge pull request #18853 from Mangesh-Khairnar/fix-allocation-expiry 
fix: process allocation expiry
 2019-08-29 18:29:07 +05:30
Mangesh-Khairnar
36b30911a8 feat: customer credit limit 2019-08-29 18:06:23 +05:30
Suraj Shetty
acd00df8fb Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 17:24:23 +05:30
Suraj Shetty
ed1ec82d2f refactor: Item picking logic 
- Fix serial number selection
- Get limited item location based on required qty
- Store total item count to properly track available locations
- Pass missing serial no.
 2019-08-29 17:23:09 +05:30
pranav nachnekar
25052a0ab7 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-08-29 16:56:54 +05:30
pranav nachnekar
dbd72ea89d Added time generation 2019-08-29 16:56:19 +05:30
Mangesh-Khairnar
232b5dab81
Merge pull request #18854 from ruchamahabal/fixes 
fix: exception in Shopify Settings
 2019-08-29 16:33:46 +05:30
Deepesh Garg
dbe8dab3ce
Merge pull request #18794 from deepeshgarg007/supplier_items 
fix: Enhancement in Purchase Order
 2019-08-29 16:29:02 +05:30
Rucha Mahabal
f5b2db76cb
Merge branch 'develop' into fixes 2019-08-29 13:32:30 +05:30
Suraj Shetty
1c29c520bd Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 13:18:57 +05:30
Mangesh-Khairnar
2f322609d7
Merge pull request #18852 from mbhavesh95863/patch-1 
fix(selling): remove redundant listing
 2019-08-29 13:12:38 +05:30
Mangesh-Khairnar
74c7b04b29
Merge branch 'develop' into fixes 2019-08-29 12:31:38 +05:30
rohitwaghchaure
c20e66e0be
Merge pull request #18860 from rohitwaghchaure/added_purchase_invoice_in_buying_module 
fix: added purchase invoice in buying module
 2019-08-29 12:13:50 +05:30
rohitwaghchaure
445a93e5f5
Merge pull request #18859 from rohitwaghchaure/incorrect_valuation_rate_calculated_for_serial_no_develop 
fix: incorrect valuation rate calculated because of string replacement
 2019-08-29 12:13:02 +05:30
Suraj Shetty
66f2bc69a6 fix: Item mapping of stock entry with no reference 2019-08-29 09:23:31 +05:30
Suraj Shetty
55a2699f4c fix: Update dashboard of doctypes that are linked with pick list 2019-08-29 09:14:27 +05:30
Rohit Waghchaure
354d0af44e fix: added purchase invoice in buying module 2019-08-28 17:51:31 +05:30
Suraj Shetty
f455c92d02 fix: Remove Pick List Reference Item use Item locations table instead 2019-08-28 17:44:22 +05:30
Mangesh-Khairnar
b654dc0e28 fix: process allocation expiry 2019-08-28 17:22:56 +05:30
Rohit Waghchaure
d03d8204ab fix: incorrect valuation rate calculated because of string replacement issue 2019-08-28 17:22:50 +05:30
pranav nachnekar
adba6c833d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-08-28 17:00:27 +05:30
pranav nachnekar
7b9e30914f Added doctypes and portal pages 2019-08-28 16:57:37 +05:30
Rucha Mahabal
1707c3da95
fix: exception 
Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>
 2019-08-28 13:55:26 +05:30
Rucha Mahabal
b606d4d2ad
Merge branch 'develop' into fixes 2019-08-28 13:50:31 +05:30
Rucha Mahabal
9fa5dbd6e4 fix: raised exception in shopify 2019-08-28 13:29:03 +05:30
Suraj Shetty
1cf7270049 fix: Add picklist dashboard config 2019-08-28 12:40:58 +05:30
Suraj Shetty
be0ae7a430 fix: Doctype changes 
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
 2019-08-28 12:40:26 +05:30
Shivam Mishra
0aeccbf4b2
feat: added dashboard fixtures (#18812) 
* feat: add dashboard charts fixture

* fix: remove return statement

* feat: added patch for creating default dashboards

* chore: renamed dashboard charts

* feat: add add_dashboard function to install fixtures

* fix: reload doctype issue in patches

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard doctype

* fix (travis): reloaded dashboard chart link doctype
 2019-08-28 11:39:45 +05:30
Suraj Shetty
8f32ac0edd fix: Batch selection logic 2019-08-28 10:16:20 +05:30
Himanshu Warekar
a5b78f3c0d fix: get address in single line 2019-08-28 00:04:05 +05:30
Mangesh-Khairnar
671c20ec56
Merge branch 'develop' into patch-1 2019-08-27 22:42:35 +05:30
Mangesh-Khairnar
17d3de1821 fix: process allocation expiry 2019-08-27 22:37:12 +05:30
mbhavesh95863
cfec328c74
Same report 2 times in list 2019-08-27 19:17:19 +05:30
Suraj Shetty
c5e0838890 fix: Import get_conversion factor method 2019-08-27 12:14:17 +05:30
Suraj Shetty
974ac3e6ad fix: Update item detail for items without reference 2019-08-27 10:17:16 +05:30
Suraj Shetty
dc675b1eb0 fix: Re-order stock qty field 2019-08-27 08:06:22 +05:30
Himanshu Warekar
9057239c3c fix: display address 2019-08-26 22:40:54 +05:30
Suraj Shetty
d6be8989e4 fix: Remove "Material Issue" purpose from pick list 
- Because in material issue we already define source warehouse
 2019-08-26 22:11:49 +05:30
Faris Ansari
8ac2a2f0c4 fix: Set default Parent Item Group 2019-08-26 13:00:17 +05:30
Himanshu Warekar
1c538b9b43 Merge branch 'develop' of https://github.com/frappe/erpnext into contacts-ref 2019-08-26 12:51:51 +05:30
Himanshu Warekar
ba6fe6cde5 Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref 2019-08-26 12:49:45 +05:30
Himanshu Warekar
7243e774c2 fix: add city, state and country 2019-08-26 12:49:20 +05:30
Shivam Mishra
db3bb793e9 feat: added domain info on footer (#18839) 2019-08-26 11:29:18 +05:30
Suraj Shetty
8de8a78235 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-26 10:51:12 +05:30
Mangesh-Khairnar
5dd1b50802 fix: update show in website on disabling item (#18831) 2019-08-26 10:27:25 +05:30
Suraj Shetty
00f9930fbf style: Remove leftout print statements 2019-08-26 10:09:07 +05:30
Suraj Shetty
457da47dba fix: set for_qty instead of pick_list 2019-08-26 10:05:35 +05:30
Suraj Shetty
2b9e256002 fix: Rename method name 2019-08-26 10:05:01 +05:30
Suraj Shetty
a1aa85712b
Merge branch 'develop' into fix-timesheet-creation 2019-08-26 10:01:45 +05:30
Suraj Shetty
05f243590d fix: Show option to create pick list or work order 2019-08-26 09:29:31 +05:30
Suraj Shetty
94d7096c8c fix: Show create button only if target doc does not exists 2019-08-26 08:40:02 +05:30
Suraj Shetty
ecc801d3d8 fix: Add pick list field to delivery note 2019-08-26 08:39:11 +05:30
Suraj Shetty
be9f4ea487 fix: Add button to create pick list from material request 2019-08-26 08:38:37 +05:30
Suraj Shetty
a1dc152695 fix: Move get items location button below items table 2019-08-26 06:57:43 +05:30
Suraj Shetty
9209570937 feat: Add option to create pick list from material request 2019-08-26 06:33:27 +05:30
Nabin Hait
d8c262fd5c
fix: Translations of strings (#18825) 2019-08-23 16:32:58 +05:30
Mangesh-Khairnar
fe579c2efd fix: show a descriptive message on submission of duplicate account (#18486) 
* fix: show a descriptive message on submission of duplicate account

* Update account.py
 2019-08-23 16:31:20 +05:30
Mangesh-Khairnar
d94a389dd3 chore: remove unwanted code (#18645) 2019-08-23 16:31:09 +05:30
Deepesh Garg
98b86ecbc2
Merge branch 'develop' into supplier_items 2019-08-23 15:41:30 +05:30
Himanshu
dc0fb08ec7
Merge branch 'develop' into contacts-ref 2019-08-23 15:03:03 +05:30
Tufan Kaynak
a7ab51c5ba Update vehicle_expenses.py (#18768) 2019-08-23 12:50:52 +05:30
deepeshgarg007
59432418c6 fix: Consider multiple stock entry against a purchase order 2019-08-23 12:45:48 +05:30
Nabin Hait
6e7b9b5cb7
Update sales_invoice.py 2019-08-23 12:27:05 +05:30
Suraj Shetty
8b4d604cfd fix: Use purpose field and remove item_base_on field 2019-08-23 11:57:16 +05:30
Suraj Shetty
7f94a58bf1
Merge branch 'develop' into fix-timesheet-creation 2019-08-23 11:46:01 +05:30
Deepesh Garg
f3d78dd29c fix: Duplicate items check in Sales Invoice (#18660) 
* fix: Duplicate items check in sales Invoice

* fix: Commonified function for duplicate items check in selling controller

* fix: Set valuation rate and transaction date in child tabel
 2019-08-23 11:42:35 +05:30
KanchanChauhan
23b5f4ec99 fix: Leave Application status filter (#18770) 
When we click on Status Open in list view it throws an error.


After fix, it filters the results on Open status
 2019-08-23 11:40:09 +05:30
Nabin Hait
bdfd69a2fe
Merge branch 'develop' into contacts-ref 2019-08-23 11:34:42 +05:30
Harshit
56d03a456b fix: add contract to CRM module (#18817) 2019-08-23 11:34:25 +05:30
Anurag Mishra
db88476f8b feat: refactor invoice_discounting (#18629) 
* feat: refactor invoice_discountig

* Update invoice_discounting.py

* Update invoice_discounting.js
 2019-08-23 11:27:00 +05:30
rohitwaghchaure
88ee7d8dbe fix: POS Sync Issue (#18807) 2019-08-23 11:13:58 +05:30
Suraj Shetty
6689ed543a
Merge branch 'develop' into fix-paid-amount 2019-08-23 10:42:23 +05:30
deepeshgarg007
f2798eab50 fix: Conside multiple stock entry against a purchase order 2019-08-23 10:07:52 +05:30
Anurag Mishra
210317c0b5
fix: division by zero in asset Depereciation (#18637) 
* fix: division by zero in asset Depereciation

* fix: requested changes
 2019-08-23 00:21:26 +05:30
Himanshu Warekar
362c89ca73 Merge branch 'develop' of https://github.com/frappe/erpnext into contacts-ref 2019-08-22 17:29:38 +05:30
Suraj Shetty
687b1a5b1f fix: Make pick list submittable and add few fields 
- Add material request & item fields
- Add pick_list field to Stock Entry
- Add purpose field to pick list
 2019-08-22 16:41:14 +05:30
Suraj Shetty
8d55f81baa fix: Fix raw matterial selection based on finished item qty 2019-08-22 16:37:44 +05:30
Sahil Khan
cd25d6dc7f bumped to version 12.0.8 2019-08-22 13:30:17 +05:50
Suraj Shetty
c1f25ff9e3 fix: Add option to select qty of finished goods Item 2019-08-22 09:53:44 +05:30
Himanshu Warekar
447134d308 Merge develop into contacts-ref 2019-08-22 09:21:30 +05:30
rohitwaghchaure
224d857928
Merge pull request #18703 from rohitwaghchaure/reconciled_entry_still_has_no_clearance_date_develop 
fix: reconciled entry has not clearance date set
 2019-08-21 23:36:06 +05:30
rohitwaghchaure
a23fc327df
Merge pull request #18785 from rohitwaghchaure/payment_recon_for_debit_entry_not_working_properly_develop 
fix: debit note not reconciled with another purchase invoice using pa…
 2019-08-21 23:35:35 +05:30
Suraj Shetty
ec92486377 fix: Add option to create Stock Entry from Pick List 2019-08-21 22:10:27 +05:30
Anastes Mp
a6c6e02c49 Incorrect database table (#18558) 
Fixed Unknow Column tax_type error on offline pos
 2019-08-21 16:53:06 +05:30
Suraj Shetty
298d38cde3 test: Fix existing tests 2019-08-21 16:37:49 +05:30
Himanshu Warekar
81f20891c1 fix: query 2019-08-21 16:09:35 +05:30
Suraj Shetty
109a07b834
fix: Fix get_employees_with_number query 
if the passed number is 7039392929 then it should match 
with the employee cell_number set as `7039392929, 0288382222`
 2019-08-21 15:19:08 +05:30
Mangesh-Khairnar
5619db28cb fix: fetch capital work in progress as expense account (#18780) 2019-08-21 14:49:24 +05:30
Nabin Hait
bcb0f6038e
fix: Single gl entry should only be considered once either in opening or closing entry (#18792) 2019-08-21 14:47:33 +05:30
Deepesh Garg
e9e0c0e7d4 fix: Minor fix in GSTR-1 report (#18797) 2019-08-21 14:40:35 +05:30
Himanshu Warekar
c6e02e2a74 fix: make contact structure call popup compatible 2019-08-21 13:36:41 +05:30
Himanshu Warekar
ea97a6cb5b Merge develop into contacts-ref 2019-08-21 13:19:22 +05:30
Suraj Shetty
da2a623e38 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-21 11:48:27 +05:30
Suraj Shetty
6affeaa9c1 fix: check if number exists after striping '0' 
- Absract number striping logic to separate method
- Rename a confusing variable name
- Remove leftout print statement
 2019-08-21 09:14:56 +05:30
Suraj Shetty
d79a16c9f3 fix: Warehouse selection login 
- Rename item_loactions -> locations, reference_items -> items
- Add customer and work_order field
- fix "Get Items" button UX
- fix get_pending_work_orders query

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-21 09:03:26 +05:30
rohitwaghchaure
d36ff39498
Merge pull request #18799 from scmmishra/cart-fix 
fix: shopping cart item availability
 2019-08-21 08:58:47 +05:30
Himanshu Warekar
9f4dc3fcd4 fix: call popup get contact name from number 2019-08-20 22:20:02 +05:30
Himanshu Warekar
128f5dbff1 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into contacts-ref 2019-08-20 20:38:18 +05:30
Shivam Mishra
eab5be1110 fix: shopping cart item availability 2019-08-20 19:31:54 +05:30
Mangesh-Khairnar
c9b6c9bb61 fix: calculate opening leave balance 2019-08-20 19:18:45 +05:30
Mangesh-Khairnar
6d549b03f1
Merge branch 'develop' into fix-ledger-entry 2019-08-20 17:58:44 +05:30
Suraj Shetty
dd63b656c7 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-20 16:59:43 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
deepeshgarg007
9e6abc4948 fix: Test case fixes 2019-08-20 16:14:44 +05:30
Sahil Khan
a8403cde16 bumped to version 12.0.7 2019-08-20 16:20:26 +05:50
deepeshgarg007
cb38cc96c3 fix: Enhancement in Purchase Order 2019-08-20 15:00:48 +05:30
Mangesh-Khairnar
79414a8d36 fix: fetch employee name on leave ledger creation 2019-08-20 14:45:57 +05:30
Mangesh-Khairnar
5cdda19494 fix: ledger entries after expiry 2019-08-20 14:45:57 +05:30
rohitwaghchaure
16dda1a991 fix: group by voucher consolidated showing incorrect data for deferred entries (#18779) 2019-08-20 12:37:32 +05:30
rohitwaghchaure
d5b4b1fdaf fix: group by voucher consolidated showing incorrect data for deferred entries (#18777) 2019-08-20 12:35:15 +05:30
Suraj Shetty
5124b2806d Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-20 12:05:51 +05:30
Suraj Shetty
1a090432d9 fix: Quantity while creating pick list from work order 
- Fix get_mapped_doc config to filter items
- Fix erroneous condition in get_mapped_doc used for creation of pick_list
in sales order

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-20 12:04:07 +05:30
rohitwaghchaure
9ef7d5edaf
Merge pull request #18789 from rohitwaghchaure/asset_pro_rata_cal_for_wdv_remaining_amt_develop 
Asset pro rata cal for wdv remaining amt develop
 2019-08-20 10:33:15 +05:30
Rohit Waghchaure
5d3dee206f fixed test cases and the logic for pro rata calculation 2019-08-20 10:30:56 +05:30
Rohit Waghchaure
1583925080 fix: Pro rata calculation is not working for WDV depreciation method 2019-08-20 10:30:38 +05:30
Mangesh-Khairnar
c97a7fb845 fix: restrict the payment order to non received type payment entries 2019-08-20 00:27:43 +05:30
Mangesh-Khairnar
becb89213f
Merge pull request #18737 from Mangesh-Khairnar/fix-payment-order 
fix: restrict the payment order to non received type payment entries
 2019-08-20 00:13:32 +05:30
Rohit Waghchaure
1008e6e450 fix: debit note not reconciled with another purchase invoice using payment reconciliation 2019-08-19 20:27:15 +05:30
Deepesh Garg
33b392ac2b
Update erpnext/controllers/sales_and_purchase_return.py 
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2019-08-19 17:43:10 +05:30
Deepesh Garg
3965451c7a
Update erpnext/controllers/sales_and_purchase_return.py 
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2019-08-19 17:40:29 +05:30
deepeshgarg007
0487ad5515 fix: Code cleanup 2019-08-19 16:40:29 +05:30
deepeshgarg007
e2acc748c8 fix: Check for return against delivery noteas well 2019-08-19 16:38:04 +05:30
Mangesh-Khairnar
4645727163
Merge branch 'develop' into fix-payment-order 2019-08-19 16:29:30 +05:30
deepeshgarg007
7d288437d8 fix: Assignment 2019-08-19 16:19:48 +05:30
deepeshgarg007
c80e5fe7a1 fix: Failing sales and purchase return test cases 2019-08-19 14:38:15 +05:30
Deepesh Garg
5efedd7a60 fix: Travis (#18772) 2019-08-19 12:56:22 +05:30
Deepesh Garg
960a1cbd8f fix: Party dashboard heatmap not capturing sales, purchase and other activities (#18753) 2019-08-19 11:51:16 +05:30
Suraj Shetty
6450be5e58 fix: Get Items button 2019-08-19 10:48:21 +05:30
Suraj Shetty
669cff88d1 fix: Get items button 2019-08-19 10:38:01 +05:30
Anurag Mishra
19c3cb0d5b fix: removed filters(not required) (#18729) 2019-08-19 10:31:02 +05:30
Anurag Mishra
bc5712a1b3 fix: validated cost center in financial_statement (#18733) 
* fix: validated cost center in financial_statement

* Update financial_statements.py
 2019-08-19 10:24:44 +05:30
Mangesh-Khairnar
0df513434e fix: valuation rate in stock ledger (#18744) 
* fix: valuation rate in stock ledger

* test: allow zero valuation rate for items
 2019-08-19 10:04:52 +05:30
Karthikeyan S
d5e5e22adb
Merge pull request #18523 from Vigneshsekar/attendance_grace_period 
feat(Auto Attendance): Add grace period
 2019-08-18 13:25:48 +05:30
Deepesh Garg
77ec3cf402
Merge pull request #18757 from deepeshgarg007/accounting_dimension_fix 
fix: Default dimensions in child doctypes
 2019-08-16 17:27:14 +05:30
deepeshgarg007
0a2ed6da37 fix: Add missing semicolon 2019-08-16 15:50:17 +05:30
Deepesh Garg
6e80cbfd1e
Merge pull request #18761 from deepeshgarg007/symbol_fix_develop 
fix: Symbol fix in chart of accounts
 2019-08-16 15:48:17 +05:30
Faris Ansari
ac3579d2c6
Merge pull request #17624 from Mangesh-Khairnar/leave-management 
feat: Carry Forward Leave Expiry
 2019-08-16 15:39:24 +05:30
deepeshgarg007
8d0b6f9a60 fix: Handling if no default dimension exists 2019-08-16 14:00:26 +05:30
deepeshgarg007
42d9298318 fix: Remove extra space 2019-08-16 13:06:47 +05:30
Mangesh-Khairnar
4b71d9ca9f
Merge branch 'develop' into fix-payment-order 2019-08-16 12:42:26 +05:30
Suraj Shetty
ec1fe9e2ca Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-16 08:17:26 +05:30
Suraj Shetty
182f4def00 fix: Delivery note creation from pick list 
- Changes in serial no and batch no seletion
- Changes in warehouse overrwite logic

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-16 08:16:22 +05:30
deepeshgarg007
2fb6bc9867 fix: Default dimensions in child doctypes 2019-08-15 17:06:32 +05:30
Deepesh Garg
98a6e5cb6c
Merge pull request #18742 from rohitwaghchaure/incorrect_sequnce_between_name_and_contact 
fix: sequence of customer name and contact in the AR report
 2019-08-14 23:20:55 +05:30
Rohit Waghchaure
c5d41af10f fix: sequence of customer name and contact in the AR report 2019-08-14 18:49:19 +05:30
Mangesh-Khairnar
dbb44c8950 fix: restrict the payment order to non received type payment entries 2019-08-14 17:38:44 +05:30
Mangesh-Khairnar
ae2a0fb4c7 chore: remove unused code 2019-08-14 16:50:31 +05:30
Mangesh-Khairnar
ca55af836b fix: travis 2019-08-14 16:32:02 +05:30
Mangesh-Khairnar
3a42631e65 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-14 16:11:08 +05:30
Mangesh-Khairnar
107b2768fd refactor: replace raw sql with orm 2019-08-14 16:09:16 +05:30
Anurag Mishra
78690d7b8b fix:payment ammount validation for pos invoices (#18663) 2019-08-14 15:03:58 +05:30
Mangesh-Khairnar
760b078dc9 fix(payroll-entry): commit submitted salary slip check on change (#18694) 
* fix(payroll-entry): commit submitted salary slip check onchange

* fix: track submitted ss via flags
 2019-08-14 14:40:00 +05:30
Deepesh Garg
2c5dcbe819 fix: Error handling in payment entry (#18720) 2019-08-14 14:26:37 +05:30
Mangesh-Khairnar
06ce1f5a40 fix(quality-inspection): fetch all items for inspection type in process (#18716) 
* fix(quality-inspection): fetch all items for inspection type in process

* fix(quality-inspection): add server side validation for in process items
 2019-08-14 14:25:59 +05:30
Vignesh S
4454630549 feat(Auto Attendance): Add grace period 
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
 2019-08-14 13:40:02 +05:30
Deepesh Garg
5a7f26f4d2
Merge pull request #18717 from Anurag810/company_fix 
fix: removed hard coded string form company
 2019-08-14 12:11:33 +05:30
Anurag Mishra
de20b083a0
Merge branch 'develop' into company_fix_v13 2019-08-14 12:10:02 +05:30
Raffael Meyer
17166a5662 fix typo 2019-08-14 01:22:29 +02:00
Raffael Meyer
e6013fb02d improve error messages 2019-08-14 01:15:23 +02:00
Raffael Meyer
c29f594fc1 Check existance of DATEV Settings 2019-08-14 00:39:59 +02:00
Raffael Meyer
5fe44f906d Add fiscal year 2019-08-14 00:31:00 +02:00
Raffael Meyer
df4edaa0fd Use values from DATEV Settings 2019-08-14 00:13:31 +02:00
alyf-de
02522a0df5 Add DATEV Settings 2019-08-14 00:06:21 +02:00
Raffael Meyer
e4e7468972 Merge branch 'develop' into datev_report_headers 2019-08-13 23:17:28 +02:00
Anurag Mishra
904cbef4dc fix: removed hard coded string 2019-08-13 19:48:42 +05:30
Anurag Mishra
81d5265385 fix: removed hard coded string 2019-08-13 19:40:36 +05:30
Sagar Vora
33d00bfeae fix: v12 patches sequence (#18610) 2019-08-13 19:39:48 +05:30
rohitwaghchaure
4d7a0aaee1
Merge pull request #18705 from surajshetty3416/fix-payment-entry-account-permission 
fix: Check if account passed is accessible under Payment Entry
 2019-08-13 18:37:17 +05:30
Sagar Vora
e14a00b887 fix: v12 patches sequence (#18609) 2019-08-13 17:26:56 +05:30
Sahil Khan
f841afd48d bumped to version 12.0.6 2019-08-13 15:04:18 +05:50
Mangesh-Khairnar
dab5b1f319 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-13 13:33:26 +05:30
Mangesh-Khairnar
8b9b77959d fix: fetch min date when carry forward expiry is greater than leave allocation expiry 2019-08-13 13:20:10 +05:30
Anurag Mishra
d2f13fe0a6 fix: query (#18709) 2019-08-13 13:19:24 +05:30
Suraj Shetty
469e430d38 Merge branch 'fix-payment-entry-account-permission' of github.com:surajshetty3416/erpnext into fix-payment-entry-account-permission 2019-08-13 12:12:03 +05:30
Suraj Shetty
64a962ce97 fix: Re-organise code 2019-08-13 12:10:00 +05:30
Suraj Shetty
1a2600c9ea fix: Ignore account permission check 2019-08-13 12:09:06 +05:30
Himanshu
7df50b6ec7 fix(QMS): TreeView fixes (#18595) 
* fix: TreeView fixes

* test: test case fix
 2019-08-13 11:58:42 +05:30
Suraj Shetty
80afee04a4 fix: Set address while creating Opportunity from Lead (#18702) 
* fix: Set address while creating Opportunity from Lead

* fix: Setting of address in opportunity from Lead
 2019-08-13 10:58:29 +05:30
Suraj Shetty
bd2e7c0e53
fix: Comment description 2019-08-12 16:32:14 +05:30
Suraj Shetty
3234f0d299 fix: Check if account passed is accessible under Payment Entry 2019-08-12 16:18:36 +05:30
Faris Ansari
9eda500dbc
Merge branch 'develop' into refactor-call-popup 2019-08-12 15:56:35 +05:30
Rohit Waghchaure
fb23773935 fix: reconciled entry has not clearance date set 2019-08-12 15:35:19 +05:30
Frappe PR Bot
037caf096b feat: Updated translation (#18597) 2019-08-12 15:32:37 +05:30
Suraj Shetty
f81b6c7cfb fix: Set address while creating Opportunity from Lead (#18700) 2019-08-12 13:05:22 +05:30
DeeMysterio
1c728a7cf8 fix(delivery note): change the text invoice to sales invoice on make button (#18658) 2019-08-12 13:04:25 +05:30
DeeMysterio
cfce53103b fix(delivery note): change the text invoice to sales invoice on make button (#18666) 2019-08-12 13:03:55 +05:30
Michelle Alva
af969d664f Added Employee Tax Exxxemption category and sub-category links (#18659) 2019-08-12 12:59:59 +05:30
Himanshu
19199baf29 fix: miscellaneous fixes (#18615) 2019-08-12 12:17:28 +05:30
Himanshu
ebf38c5ebd fix: misc fixes (#18616) 2019-08-12 12:17:16 +05:30
Andrew McLeod
c97ffaeac3 fix: Python3 urllib use in item_group.py (now uses six.moves) (#18643) 2019-08-12 12:06:30 +05:30
Andrew McLeod
677c522f01 fix: Python3 urllib use in item_group.py (now uses six.moves) (#18642) 2019-08-12 12:06:23 +05:30
Shivam Mishra
8363a6e585 refactor: remove from date and to date from standard filter (#18696) 2019-08-12 11:58:14 +05:30
Suraj Shetty
83705af0b3 fix: Filters for portal quotation list (#18689) 
* fix: Filters for portal quotation list

* fix: Remove unwanted import
 2019-08-12 11:51:27 +05:30
sahil28297
214815eb62 fix(patch): force reload child docs (#18672) 2019-08-12 11:49:21 +05:30
sahil28297
a0b9b3cef5 fix(patch): force reload child docs (#18671) 2019-08-12 11:49:14 +05:30
Deepesh Garg
cd7a89da32
Merge pull request #18691 from deepeshgarg007/gstr-3b-non-gst-v12 
fix: GSTR 3B report fixes
 2019-08-11 19:50:44 +05:30
Deepesh Garg
43dc351209
Merge pull request #18692 from deepeshgarg007/gstr-3b-non-gst-develop 
fix: GSTR 3B report fixes
 2019-08-11 19:50:29 +05:30
deepeshgarg007
9db6471fae fix: Test Case 2019-08-11 17:29:09 +05:30
deepeshgarg007
4b28b3216b fix: Test Cases 2019-08-11 17:28:55 +05:30
deepeshgarg007
db01743885 fix: Test Case 2019-08-11 15:47:35 +05:30
deepeshgarg007
b87c5d83de fix: Test Cases 2019-08-11 12:40:45 +05:30
deepeshgarg007
c36abbcda3 fix: GSTR 3B report fixes 2019-08-11 11:01:02 +05:30
deepeshgarg007
dabcb6b531 fix: GSTR 3B report fixes 2019-08-11 10:58:16 +05:30
Deepesh Garg
1fb21cd9e5
Merge branch 'version-12-hotfix' into fix-item-template-description 2019-08-10 17:36:00 +05:30
Deepesh Garg
e6b076cb34
Merge pull request #18632 from netchampfaris/fix-item-template-description-fp 
fix(Item Template): Fallback description string
 2019-08-10 17:33:59 +05:30
Deepesh Garg
0b711d1f8a
Merge pull request #18684 from marination/fixes_v12 
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
 2019-08-10 17:26:54 +05:30
Suraj Shetty
3f7a757e80 Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup 2019-08-09 19:23:09 +05:30
Suraj Shetty
d4edd284e6 fix: Set Contact or Lead for call log 
- Set contact or lead to call log on new Contact or Lead creation
 2019-08-09 19:23:04 +05:30
Suraj Shetty
b282f1f154
Merge branch 'develop' into refactor-call-popup 2019-08-09 18:18:17 +05:30
Himanshu Warekar
3fbfac64c2 Merge contacts-ref into contacts-ref 2019-08-09 17:51:14 +05:30
Himanshu Warekar
12fbecf48b fix: use primary label instead of bold letters 2019-08-09 17:50:03 +05:30
Himanshu
59a6821299
Merge branch 'version-12-hotfix' into contacts-ref 2019-08-09 16:52:39 +05:30
marination
9839a9afb0 fix: Fixed error message in Payment Entry for outstanding invoices not found via filters 2019-08-09 15:54:18 +05:30
marination
4583100537 fix: Fixed error message in Payment Entry for outstanding invoices not found via filters 2019-08-09 15:30:05 +05:30
Deepesh Garg
ca5fdeb9bb
Merge pull request #18683 from Mangesh-Khairnar/fix-translation-test 
test: Translation in search
 2019-08-09 15:29:33 +05:30
rohitwaghchaure
5790fabd54
Merge pull request #18669 from rohitwaghchaure/removed_stock_item_condition_for_sub_contract_v12 
fix: allow to subcontract service raw materials
 2019-08-09 15:18:38 +05:30
rohitwaghchaure
ed6fb66a90
Merge pull request #18679 from Anurag810/get-item-from-product-bundle 
fix: get item from product bundle
 2019-08-09 15:17:42 +05:30
Mangesh-Khairnar
7c7e9ecfcd test: translation fix 2019-08-09 14:48:36 +05:30
Anurag Mishra
8d4b04e719 fix: get item from product bundle 2019-08-09 14:34:09 +05:30
Mangesh-Khairnar
e173d54054 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-09 13:37:51 +05:30
Anurag Mishra
24c3b4e00f fix: get item from product bundle 2019-08-09 13:27:59 +05:30
Mangesh-Khairnar
261d132f3a fix: calculate earned leaves based on annual allocation 2019-08-09 13:18:52 +05:30
Himanshu
0184c981ee
Merge branch 'version-12-hotfix' into contacts-ref 2019-08-09 11:15:28 +05:30
Suraj Shetty
e047de854b Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-09 11:14:14 +05:30
Himanshu
ffddcb0526
Merge branch 'version-12-hotfix' into qms-fixes 2019-08-09 11:06:36 +05:30
Himanshu Warekar
86f3310ac1 fix: iterate over valid variable 2019-08-09 11:05:04 +05:30
Himanshu Warekar
f94d183297 feat: move to newer contacts structure 2019-08-08 23:50:03 +05:30
Himanshu Warekar
224c2ddaf4 feat: render multiple addresses 2019-08-08 23:34:34 +05:30
Mangesh-Khairnar
3662ed50d2 fix: multiple changes 2019-08-08 19:47:17 +05:30
Suraj Shetty
7e818067eb
Merge branch 'develop' into refactor-call-popup 2019-08-08 19:18:03 +05:30
Suraj Shetty
44b906a43d Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup 2019-08-08 19:16:37 +05:30
Suraj Shetty
429bfcfd83 fix: Make requested changes 2019-08-08 19:16:32 +05:30
Rohit Waghchaure
10e8073204 fix: allow to subcotract service raw materials 2019-08-08 18:20:53 +05:30
Faris Ansari
99c26e068d fix: Set Maintenance Status fields as Read Only (#18634) 
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
 2019-08-08 17:45:49 +05:30
Faris Ansari
cfd19afabf fix: Set Maintenance Status fields as Read Only (#18633) 
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
 2019-08-08 17:45:44 +05:30
Mangesh-Khairnar
bafc89f439 refactor: convert raw sql to orm 2019-08-08 17:43:23 +05:30
rohitwaghchaure
9f9184c908 fix: not able to transfer raw materials for subcontracted items (#18650) 2019-08-08 17:41:38 +05:30
rohitwaghchaure
536e6bf57c fix: group by condition in the payment reconciliation (#18657) 2019-08-08 17:40:57 +05:30
Mangesh-Khairnar
f3a5188bec fix: accounting period (#18477) 
* fix: accounting period

* test: accounting period

* fix: account period creation

* fix: remove status field from accounting period
 2019-08-08 17:39:13 +05:30
Mangesh-Khairnar
9bc4232af6 feat: calculate remaining leaves both multiple simultaneous allocation 2019-08-08 17:11:08 +05:30
Mangesh-Khairnar
5cbe6160ca feat: consider carry forwarded leaves on creation of encashment 2019-08-08 17:06:15 +05:30
Deepesh Garg
f2bf76a2ef fix: Show Cr or Dr symbol in chart of accounts based on balance (#18653) 
* fix: Show Cr or Dr symbol in chart of accounts based on balance

* fix: Typo fix in comment
 2019-08-08 15:52:39 +05:30
Deepesh Garg
f729eed035 fix: Show Cr or Dr symbol in chart of accounts based on balance (#18654) 
* fix: Show Cr or Dr symbol in chart of accounts based on balance

* fix: Typo fix in comment
 2019-08-08 15:52:25 +05:30
Deepesh Garg
065e8f3650 fix: Changes in print format due to attribute name changes in frappe (#18639) 2019-08-08 15:51:56 +05:30
Deepesh Garg
04b42600b0 fix: Changes in print format due to attribute name changes in frappe (#18641) 2019-08-08 15:51:50 +05:30
Faris Ansari
df7644a96d fix: Show created serial nos as links in message (#18635) 
Fixes #18623
 2019-08-08 15:50:24 +05:30
Faris Ansari
afae8a0c46 fix: Show created serial nos as links in message (#18636) 
Fixes #18623
 2019-08-08 15:50:17 +05:30
Aditya Hase
472050bb8a fix(quickbooks): Do not build global search for QuickBooks Migrator (#18628) 2019-08-08 15:48:35 +05:30
Aditya Hase
f19b7b9122 fix(quickbooks): Do not build global search for QuickBooks Migrator (#18627) 2019-08-08 15:48:09 +05:30
Mangesh-Khairnar
e5c733bdb3 fix: Accounting period (#18630) 
* fix: accounting period

* test: accounting period

* fix: account period creation

* fix: remove status field from accounting period
 2019-08-08 15:44:11 +05:30
Suraj Shetty
c7716f0bbc
Merge branch 'develop' into refactor-call-popup 2019-08-08 12:50:20 +05:30
Himanshu Warekar
b9f2a6048b test: fix test cases 2019-08-07 18:21:38 +05:30
Faris Ansari
3623452839 fix(Item Template): Fallback description string 
Fixes #18572
 2019-08-07 17:21:51 +05:30
Faris Ansari
2260838933 fix(Item Template): Fallback description string 
Fixes #18572
 2019-08-07 17:21:22 +05:30
Himanshu
1b48448b7b
Merge branch 'version-12-hotfix' into qms-fixes 2019-08-07 11:32:06 +00:00
Rushabh Mehta
6276f1adc5 fix(minor): don't update modified timestamp for overdue tasks 2019-08-07 16:32:44 +05:30
Sahil Khan
c5ae3cc120 bumped to version 12.0.5 2019-08-07 16:41:13 +05:50
Suraj Shetty
cab8e9be89 fix(timesheet): Hours automatically used to set 0 
- Case: If the company had standard working hour set
and when the user creates a timesheet with same date for
"To" and "From" then the hours field automatically used to
get reset to 0 after saving the form.
 2019-08-07 10:40:29 +05:30
Suraj Shetty
0c699f0726 fix: Paid amount 0 while creating advanced payment entry 
Paid amount is set 0 while creating advanced payment entry
against multi-currency purchase order.

Solution: Populate paid amount value after applying conversion rate
 2019-08-07 10:17:05 +05:30
Suraj Shetty
9f4b270116 fix: prev_doc 2019-08-06 09:03:23 +05:30
Suraj Shetty
4ca82f9308 fix: Show contact and lead name in list view 2019-08-06 05:49:01 +05:30
Suraj Shetty
207f218db3 Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup 2019-08-06 05:44:28 +05:30
Suraj Shetty
89d8a0b6fd fix: reset_employee_emails_cache method 2019-08-06 05:44:13 +05:30
Himanshu
76c6a050af
Merge branch 'version-12-hotfix' into qms-fixes 2019-08-05 17:12:44 +00:00
Deepesh Garg
235166ec41
Merge pull request #18592 from deepeshgarg007/utils_fix_v12 
fix: Ambigious column in query
 2019-08-05 22:38:45 +05:30
Suraj Shetty
f6f849226e
Merge branch 'develop' into refactor-call-popup 2019-08-05 21:25:12 +05:30
Suraj Shetty
7d3f1fef1c fix: Employee selection for call popup 
- Check if employee with matched number is also
 scheduled to receive popup
 2019-08-05 21:21:45 +05:30
Mangesh-Khairnar
314647572c fix: check for old unexpired allocation 2019-08-05 15:35:19 +05:30
Mangesh-Khairnar
6bed870dfa feat: pro-rata leave allocation 2019-08-05 14:47:53 +05:30
Mangesh-Khairnar
f281f00d43 feat: auto leave encashment 2019-08-05 14:47:53 +05:30
Deepesh Garg
e4abaa7cdd
Merge pull request #18591 from deepeshgarg007/utils_fix_develop 
fix: Ambigious column in query
 2019-08-05 14:45:30 +05:30
Himanshu Warekar
e8f95a2adf fix: TreeView fixes 2019-08-05 14:21:09 +05:30
Rucha Mahabal
d9fa83b196 fix: added Company by default in session defaults (#18471) 2019-08-05 14:15:16 +05:30
deepeshgarg007
23f30cdb8b fix: Aambigious column in query 2019-08-05 12:42:35 +05:30
deepeshgarg007
043f70e9a6 fix: Aambigious column in query 2019-08-05 12:40:50 +05:30
Deepesh Garg
7638301d01
Merge pull request #18527 from netchampfaris/bom-comparison-tool 
feat: BOM Comparison Tool
 2019-08-05 11:58:46 +05:30
Suraj Shetty
0957480305 fix: Show popup to employees with same phone number 2019-08-05 11:32:51 +05:30
rohitwaghchaure
9601b6c601 feat: added checkbox 'Update Consumed Material Cost In Project' in work order to don't update the consumed material cost in the project for the subassembely work orders (#18533) 2019-08-05 10:40:23 +05:30
Frappe PR Bot
833afea3e3 feat: Updated translation (#18542) 2019-08-05 10:38:37 +05:30
Anurag Mishra
08df6bda41 fix: query (#18468) 2019-08-05 10:27:25 +05:30
Mangesh-Khairnar
31c5c1e562 fix(payroll-entry): show make bank entry button (#18497) 
* fix(payroll-entry): show make bank entry button when manually submitting salary slip

* Update payroll_entry.py
 2019-08-05 10:21:19 +05:30
Anurag Mishra
7e1987ed48 feat: validate cwip accounts for journal Entry (#18518) 2019-08-05 10:18:57 +05:30
Anurag Mishra
f9fb92ebb0 feat: validate cwip accoutns in journal entry (#18519) 2019-08-05 10:18:37 +05:30
Mangesh-Khairnar
a3d5200194 fix(sales-order): update items (#18535) 
* fix(sales-order): update items

* fix: minor changes

* Update: accounts controller
 2019-08-05 10:16:40 +05:30
Mangesh-Khairnar
9accae3ddc fix(sales-order): update items (#18536) 
* fix(sales-order): update items

* fix: minor changes
 2019-08-05 10:16:25 +05:30
Deepesh Garg
8b0302bab9 fix: Make conversion rate optional for non itemized items (#18540) 2019-08-05 10:14:19 +05:30
Deepesh Garg
cfb899451f fix: Make conversion rate optional for non itemized items (#18541) 2019-08-05 10:14:05 +05:30
Deepesh Garg
fb5aa43e77 fix: Type error handling while getting material request items (#18549) 
* fix: Type error handling while getting material request items

* fix: Remove flt
 2019-08-05 10:12:42 +05:30
Deepesh Garg
713d4bb1ba fix: Type error handling while getting material request items (#18550) 
* fix: Type error handling while getting material request items

* fix: Remove flt
 2019-08-05 10:12:17 +05:30
Deepesh Garg
a7eaa4de14 fix: Customer price list not honored in shopping cart (#18556) 2019-08-05 10:10:53 +05:30
Deepesh Garg
65ad4287b6 fix: Customer price list not honored in shopping cart (#18557) 2019-08-05 10:10:38 +05:30
Suraj Shetty
580fa48642 fix: Quotation list in customer portal (#18579) 
* fix: Quotation list in customer portal

Customers were not able to see their quotations because of
 the recent customer field removal from quotation

* fix: Remove duplicate code
 2019-08-05 10:08:35 +05:30
Mangesh-Khairnar
06a0afa039 Feat: Notify by email feature (#18587) 
* feat: notify user by email in employee onboarding control

* fix: create task on update after submit
 2019-08-05 10:07:05 +05:30
Nabin Hait
a813571c17
Update employee_advance.py 2019-08-05 10:05:28 +05:30
Mangesh-Khairnar
d66396f4e9 fix(employee-advance): update employee advance on change in expense claim (#18588) 
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim

* fix(expense-claim): display appropriate buttons only if linked transactions are valid

* Update employee_advance.py
 2019-08-05 10:04:05 +05:30
Mangesh-Khairnar
c92e823651 fix(employee-advance): update employee advance on change in expense claim (#18590) 
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim

* fix(expense-claim): display appropriate buttons only if linked transactions are valid
 2019-08-05 10:02:32 +05:30
Suraj Shetty
35c4b78e66 Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup 2019-08-04 22:23:03 +05:30
rohitwaghchaure
ed7e074985
Merge pull request #18570 from rohitwaghchaure/add_serial_no_button_not_working 
fix: add serial no button not working for the delivery note
 2019-08-04 12:02:43 +05:30
Deepesh Garg
7668cd7053
Merge pull request #18577 from deepeshgarg007/taxes_and_totals_v13 
fix: Error handling in taxes and totals
 2019-08-03 18:26:54 +05:30
deepeshgarg007
b656529818 fix: Error handling in taxes and totals 2019-08-03 13:49:33 +05:30
deepeshgarg007
8bf19ce81a fix: Error handling in taxes and totals 2019-08-03 13:44:44 +05:30
deepeshgarg007
a499079250 fix: Remove non standard fieldname 2019-08-03 10:27:33 +05:30
deepeshgarg007
75465775b4 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into error_report_v12 2019-08-03 10:26:46 +05:30
deepeshgarg007
b0916a35dc fix: Remove payment order from bank dashboard 2019-08-03 10:24:04 +05:30
deepeshgarg007
93e46310b8 fix: Remove payment order from bank dashboard 2019-08-03 10:17:44 +05:30
Suraj Shetty
4b3b358ac6 fix: Show correct label instead of showing undefined (#18559) 2019-08-02 21:46:38 +05:30
Suraj Shetty
e45102b913 fix: Show correct label instead of showing undefined (#18560) 2019-08-02 21:46:28 +05:30
Rohit Waghchaure
dadd049cbf fix: add serial no button not working for the delivery note 2019-08-02 19:11:31 +05:30
Suraj Shetty
6fd3a86012 fix: Option to create pick list from work order 2019-08-02 16:48:31 +05:30
Sahil Khan
8426ff726a Merge branch 'version-12-hotfix' into version-12 2019-08-02 14:27:59 +05:30
Sahil Khan
968da1cd21 bumped to version 12.0.4 2019-08-02 14:47:59 +05:50
sahil28297
c7abc025ff
Merge branch 'develop' into task-fix 2019-08-02 14:14:52 +05:30
Shivam Mishra
0313dc0f8c fix: task not updated issue 2019-08-02 14:12:36 +05:30
Shivam Mishra
dc53e8ebb0 fix: task not updated issue 2019-08-02 13:56:49 +05:30
Suraj Shetty
c6857e562b
fix: Check zero valuation rate only for valid doctypes (#18529) 
fix: Check zero valuation rate only for valid doctypes
 2019-08-02 11:22:31 +05:30
Suraj Shetty
c154e57603
Merge branch 'develop' into stock-ledger-fix_develop 2019-08-02 08:44:21 +05:30
Suraj Shetty
b559bf6de6
Merge branch 'version-12-hotfix' into stock-ledger-fix 2019-08-02 08:43:54 +05:30
Suraj Shetty
c57328669a feat: Add pick list print format 2019-08-02 08:14:27 +05:30
Suraj Shetty
b35c0410b1 fix: Add option to get items from work order 2019-08-02 08:12:30 +05:30
Rohan
fc04d334da
Merge branch 'develop' into develop-customer-item-price-report 2019-08-01 17:51:03 +05:30
Suraj Shetty
a7dc3735ae fix: Move folders to right location 2019-08-01 15:49:29 +05:30
deepeshgarg007
c16ef32b6b fix: Payment Order link fix in bank dashboard 2019-08-01 14:10:03 +05:30
deepeshgarg007
8704bc6f39 fix: Payment Order link fix in bank dashboard 2019-08-01 13:24:48 +05:30
Suraj Shetty
31e3dada0e
Merge branch 'version-12-hotfix' into bom-comparison-tool 2019-08-01 12:59:19 +05:30
Suraj Shetty
e06f486aee fix: Rename methods 2019-08-01 12:54:33 +05:30
Faris Ansari
d9e482759c
style: Missing semicolon 2019-08-01 12:53:19 +05:30
Suraj Shetty
bb7a2dbb6a fix: Rename file 2019-08-01 12:38:26 +05:30
Suraj Shetty
0c1dbb116f Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-01 12:06:20 +05:30
Suraj Shetty
fbcc56536b fix: Rename Pick TIcket -> Pick List 2019-08-01 12:05:20 +05:30
Suraj Shetty
fa9111ebe2 fix: Add and rename some fields 
- Add ability to create delivery note from pick ticket
- Minor fix related to create button
 2019-08-01 11:07:14 +05:30
Mangesh-Khairnar
8fb600162e fix: remove all leaves via scheduler 2019-07-31 19:31:26 +05:30
Mangesh-Khairnar
5eac8703da fix: create reverse expiry for back dated leaves 2019-07-31 19:28:21 +05:30
Deepesh Garg
d301d26fda fix: Enhancement in credit note (#18511) 
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
 2019-07-31 15:58:19 +05:30
Deepesh Garg
b65c761b16 fix: Enhancement in credit note (#18510) 
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
 2019-07-31 15:58:01 +05:30
rohitwaghchaure
fdb5e6b2e5
Merge pull request #18531 from rohitwaghchaure/scrap_item_not_adding_v12_hotfix 
fix: scrap item not adding while doing finished good entry
 2019-07-31 00:47:01 +05:30
Rohit Waghchaure
862363521b fix: scrap item not adding while doing finished good entry 2019-07-30 23:57:58 +05:30
deepeshgarg007
f9c0ef3eb3 fix: Check zero valuation rate only for valid doctypes 2019-07-30 19:01:53 +05:30
deepeshgarg007
548293ad08 fix: Check zero valuation rate only for valid doctypes 2019-07-30 18:49:19 +05:30
Faris Ansari
f650cb8e4b style: Indent and missing semicolon 2019-07-30 17:46:15 +05:30
Faris Ansari
a4ada93834 fix: Field labels 2019-07-30 17:11:34 +05:30
Faris Ansari
66064c7827 fix: Add BOM Comparison Tool to module view 2019-07-30 17:11:18 +05:30
Faris Ansari
1214e2d2a4 feat: BOM Comparison Tool 2019-07-30 16:54:46 +05:30
Sahil Khan
403968b2f7 bumped to version 12.0.3 2019-07-30 13:29:07 +05:50
Suraj Shetty
72d03464dc fix: Show "Get Item Location" only if there are reference items 2019-07-30 11:56:24 +05:30
Suraj Shetty
14fb1600ec fix: Select location based on group warehouse 2019-07-30 11:47:21 +05:30
Suraj Shetty
341f7733d1 fix: Make item read-only in item location table 2019-07-30 10:02:50 +05:30
Suraj Shetty
e260e8239f fix: Batch number selection code 2019-07-30 10:02:10 +05:30
Suraj Shetty
55ab31314c fix: Add code to set batch no 
- And split item based on batch availibility
 2019-07-30 09:02:03 +05:30
rohitwaghchaure
2a45eadc28
Merge pull request #18514 from deepeshgarg007/trail_balance_fix_hotfix 
fix: Opening balance not getting calculated in trail_balance_report
 2019-07-29 20:56:00 +05:30
Suraj Shetty
36c724d7b5
fix(Issue): reset issue fulfilled indicator (#18454) 
fix(Issue): reset issue fulfilled indicator
 2019-07-29 18:27:53 +05:30
Suraj Shetty
344df219a4
Merge pull request #18453 from hrwX/iss_ful_fix_v12 
fix(Issue): change agreement fulfilled to ongoing when resetting SLA
 2019-07-29 18:27:43 +05:30
rohitwaghchaure
3e4cabfd6c
Merge pull request #18516 from rohitwaghchaure/can_t_compare_datetime_issue_for_quotation 
fix: can't compare datetime.date to unicode
 2019-07-29 17:59:08 +05:30
Rohit Waghchaure
40e35048b8 fix: can't compare datetime.date to unicode 2019-07-29 17:14:39 +05:30
Suraj Shetty
9ad10cb425 test: Add basic tests 2019-07-29 16:52:26 +05:30
Deepesh Garg
62daa43a4c
Merge pull request #18513 from deepeshgarg007/trail_balance_fix 
fix: Opening balance not getting calculated in trail balance report
 2019-07-29 15:38:39 +05:30
rohitwaghchaure
a55e4e2c03
Merge pull request #18452 from rohitwaghchaure/scrap_item_not_adding 
fix: scrap item not adding while doing finished good entry
 2019-07-29 15:30:24 +05:30
deepeshgarg007
107c07e5cb fix: Opening balance not getting calculated in trail_balance_report 2019-07-29 15:01:22 +05:30
deepeshgarg007
4c652396d0 fix: Opening balance not getting calculated in trail_balance_report 2019-07-29 14:57:33 +05:30
deepeshgarg007
f37fb82069 fix: Code cleanup 2019-07-29 12:14:49 +05:30
deepeshgarg007
d9f3ba5fda fix: Reload doc in patch 2019-07-29 12:14:49 +05:30
deepeshgarg007
724be6eca2 fix: GL entry validation fix 2019-07-29 12:14:49 +05:30
deepeshgarg007
82661372f7 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-29 12:14:49 +05:30
deepeshgarg007
3d15128b91 fix: Test cases for accounting dimensions 2019-07-29 12:14:49 +05:30
deepeshgarg007
1c1f6f90bb fix: Test Cases for accounting dimensions 2019-07-29 12:14:49 +05:30
deepeshgarg007
5dfe4df23b fix: Set query fix 2019-07-29 12:14:49 +05:30
deepeshgarg007
22a4857a3c fix: Codacy Fixes 2019-07-29 12:14:49 +05:30
deepeshgarg007
acc0958ead fix: Patch 2019-07-29 12:14:49 +05:30
deepeshgarg007
f1f79ff1e1 fix: Remove dimensions from boot 2019-07-29 12:14:49 +05:30
deepeshgarg007
7d270edf79 fix: Added default dimension and filter in bootinfo 2019-07-29 12:14:49 +05:30