Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,997 Commits 3 Branches 0 Tags 1 GiB
558fcc140f
Commit Graph

829 Commits

Author SHA1 Message Date
Nabin Hait
55a8797919 Set cost center while creating invoice from SO/PO 2016-10-18 14:54:17 +05:30
Rohit Waghchaure
a26f685b9f [Enhancement] Added supplier quotation link on rfq 2016-10-05 15:04:50 +05:30
Neil Trini Lasrado
3da7354ba4 removed supplier role from Request for Quotation 2016-09-29 11:57:23 +05:30
Rushabh Mehta
2d4f3bb04a [fix] space 2016-09-22 15:17:04 +05:30
Nabin Hait
be4c527453 Merge pull request #6426 from rohitwaghchaure/supplier_portal_enhancement 
[Enhancement] Supplier quotation added on supplier portal
 2016-09-21 18:41:21 +05:30
Rohit Waghchaure
a7e3d11077 [Fix] Image is copied when duplicate supplier, employee 2016-09-21 18:13:16 +05:30
Rohit Waghchaure
21499e820d [Enhancement] Supplier quotation added on supplier portal 2016-09-21 17:07:25 +05:30
Nabin Hait
902bcc07b5 Merge pull request #6401 from rmehta/fix-lead-link 
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
 2016-09-19 19:22:34 +05:30
Rushabh Mehta
559aa3ab7c [enhance] show customer, supplier billing and outstanding, fixes #6078 2016-09-19 16:04:58 +05:30
Rushabh Mehta
bd15e31ea1 [minor] [enhance] fixes #6222 2016-09-19 15:27:09 +05:30
Chude Osiegbu
3c6a937a7c Merge branch 'develop' into exchange_rate_modifications 2016-09-18 21:47:55 +01:00
Kanchan Chauhan
d1d129edf0 Actual Qty added to Material Request Item 2016-09-19 00:22:37 +05:30
Rohit Waghchaure
00295f2b8d make supplier quotation from opportunity 2016-09-14 15:36:40 +05:30
Ben Cornwell-Mott
8d0b826840 Added supplier quotation filter for Quoted Item Comparison 2016-09-09 08:00:54 -07:00
Chude Osiegbu
fbf27b5031 Further corrections to Currency Exchange table 2016-09-07 03:06:08 +01:00
Rohit Waghchaure
b44efef094 [Issue] Fixed, supplier quotation item uom conversion 2016-09-06 17:21:38 +05:30
Rohit Waghchaure
560ba391f9 [Enhancement] Purchase return for rejected qty 2016-09-05 00:43:17 +05:30
Kanchan Chauhan
dd96cbd012 Coded column deleted, column added from UI 2016-08-26 14:32:38 +05:30
Rushabh Mehta
fcb793e4dd [minor] language fields are now links 2016-08-23 16:51:18 +05:30
Nabin Hait
33bcaa8a07 Merge pull request #6080 from bcornwellmott/quoteditem_picksupplier 
Quoted Item Comparison: Button for setting the default_supplier
 2016-08-17 11:36:55 +05:30
Rushabh Mehta
d973c1606a [revert] is_sales_item, is_purchase_item back 2016-08-16 11:32:08 +05:30
Ben Cornwell-Mott
b739dd24b2 Added a button to assist in setting the default_supplier 2016-08-11 19:45:55 -07:00
Rushabh Mehta
6646960e31 Merge pull request #6045 from bcornwellmott/quotereportcurrency 
Quoted item currency
 2016-08-10 14:26:25 +05:30
Rushabh Mehta
6252e935a0 Merge pull request #5844 from bcornwellmott/quoteditemplot-1 
Added C3.JS Plot to compare quotes in Print view
 2016-08-10 12:50:36 +05:30
Ben Cornwell-Mott
44f85fed26 Converted to a common currency (company) 2016-08-07 10:29:51 -07:00
Rohit Waghchaure
b77a1057ce fixes and cleanups. 2016-08-06 12:45:02 +05:30
Nabin Hait
981f6ea34e minor fix for item and employee link formatter 2016-07-31 11:44:43 +05:30
Nabin Hait
7bae70a993 [fix] Show supplier name field if it is different from supplier id 2016-07-28 17:19:35 +05:30
Ben Cornwell-Mott
590d2d524b Updated html file to use c3.js instead of Google Charts 2016-07-25 18:03:01 -07:00
Rushabh Mehta
6c3ac9587e [fix] quick entry 2016-07-25 15:03:39 +05:30
Ben Cornwell-Mott
fe11e71084 Removed hover tooltip 2016-07-22 10:02:41 -07:00
Ben Cornwell-Mott
2c76aec119 Added Google Chart to compare quotes in Print view 2016-07-22 09:56:29 -07:00
Rushabh Mehta
29517d0b8c [fix] purchase order dashboard 2016-07-22 21:01:39 +05:30
Ben Cornwell-Mott
99e03f2371 Added new report for Supplier Quotation comparisons 2016-07-21 13:03:58 -07:00
Rushabh Mehta
5a39d41a0c [redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792 2016-07-20 22:53:23 +05:30
Rushabh Mehta
76b134192f [fix] grid columns now restricted to 10 2016-07-18 14:30:27 +05:30
Rushabh Mehta
176b63b354 [fix] remove first row on mapping, fixes #5707 2016-07-14 17:43:48 +05:30
Rushabh Mehta
3ce24d64c2 [cleanup] payment entry form view 2016-07-11 16:08:46 +05:30
Rushabh Mehta
391c0efcee [fix] make grids editable 2016-07-11 13:01:58 +05:30
Rushabh Mehta
cca33b2ff0 [cleanup] 2016-07-11 13:01:58 +05:30
Rushabh Mehta
ea0ff23891 [cleanup] form dashboards 2016-07-07 14:28:05 +05:30
Rushabh Mehta
964ad0fcae [cleanup] rename "links" to "dashboard" 2016-07-07 14:28:05 +05:30
Nabin Hait
a9d3981c86 [fix] Condition for visibility of 'Get Items from Open Material Requests' in PO 2016-07-07 11:34:34 +05:30
Rohit Waghchaure
f154c611bb [Fixes] RFQ contact and multiple creation of supplier quotation issue 2016-07-06 17:26:15 +05:30
Rohit Waghchaure
a71d9d33af Rename prevdoc field in purchase order and purchase receipt doctype 2016-07-06 12:13:29 +05:30
Rushabh Mehta
e38872294a [fix] [patch] 2016-07-04 17:34:25 +05:30
Rushabh Mehta
1d797f717b [fix] warehouse validation for parent_account 2016-07-04 17:07:08 +05:30
Nabin Hait
13093b4b68 Make payment entry aginst order, payment request and patch to rename advance table fields 2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4 Advance Payment Entry adjustment against Invoice 2016-07-04 11:42:04 +05:30
Rushabh Mehta
b33df4afe8 [cleanup] link methods made common 2016-07-04 11:39:25 +05:30
Rushabh Mehta
5f5f0bec2c [fix] buttons for rfq and material request 2016-07-04 11:39:25 +05:30
Rushabh Mehta
6703792472 Merge pull request #5618 from rohitwaghchaure/sq_field_and_rfq_fixes 
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
 2016-07-04 10:59:11 +05:30
Rohit Waghchaure
4d8f4d76e1 [Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI 2016-07-01 15:33:57 +05:30
Rohit Waghchaure
fc1fa9a774 [RFQ Enhancement] Added button on supplier row to download PDF for particular supplier 2016-07-01 14:53:11 +05:30
Rushabh Mehta
cfb81205b3 Merge pull request #5612 from shubham7saxena/rfq-sidebar 
[minor][bug fix]added sidebar visibility to request for quotation link
 2016-06-30 14:39:55 +05:30
shubham7saxena
778184e5e0 added sidebar visibility to request for quotation link 2016-06-30 14:27:28 +05:30
Rohit Waghchaure
a314872cb5 [RFQ] Enhancement and minor fixes 2016-06-30 02:26:02 +05:30
Saurabh
b6d6b8420d [fix] add filters and child doc name in previous link mapper 2016-06-27 14:48:26 +05:30
Saurabh
2a0b111726 [fix] mark completed docuemts on document flow 2016-06-27 12:28:55 +05:30
Saurabh
8f24ecb173 [fix] set previous doc links for document flow 2016-06-27 12:28:55 +05:30
Nabin Hait
4cc7bcc412 Merge pull request #5495 from bcornwellmott/patch-3 
Add "Get items from Material Request"
 2016-06-25 13:58:50 +05:30
Rushabh Mehta
8a065e0028 [rename] Bulk Email to Email Queue 2016-06-22 12:58:39 +05:30
Nabin Hait
a531ebea8a Merge branch 'master' into develop 2016-06-21 16:44:05 +05:30
Umair Sayyed
5918dc87f3 small fixes 2016-06-17 12:28:21 +05:30
bcornwellmott
9af68078f6 Add "Get items from Material Request" 
Allows users to pull items from multiple Material Requests into a Request for Quotation
 2016-06-16 14:10:57 -07:00
Rushabh Mehta
d1eba515e9 [cleanup] fixes to v7 2016-06-13 17:47:13 +05:30
Anand Doshi
7f8142d30d [fix] reuse user.reset_password in RFQ 2016-06-13 17:23:18 +05:30
Rushabh Mehta
dd7524f844 [minor] msgprint as alert 2016-06-12 11:16:23 +05:30
Rushabh Mehta
538607e6b6 [cleanup] a better message for insufficient stock 2016-06-12 11:03:00 +05:30
Rohit Waghchaure
2dd26055c9 [Fix] Shipping address's get_query not working on autocomplete. 2016-06-11 01:48:00 +05:30
Anand Doshi
16e2442278 [cleanup] document flow 2016-06-07 18:55:23 +05:30
Saurabh
7d0e78d399 [fixes] this.frm instead of cur_frm 2016-06-07 17:19:36 +05:30
Saurabh
9df3d0fb8a [enhance] show module flow on top of document 2016-06-07 17:19:36 +05:30
Nabin Hait
9f98296c9c minor fix 2016-06-01 16:21:43 +05:30
Nabin Hait
9a5cf6000e [fix] Test cases and editable fields settings for request for quotation 2016-06-01 12:54:26 +05:30
Rushabh Mehta
aa60fd9037 [fix] new_doc to frappe.new_doc 2016-06-01 11:46:33 +05:30
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Rohit Waghchaure
bc894428ca Added today as default in transaction. 2016-05-23 15:22:36 +05:30
Rohit Waghchaure
6c60c164f1 [Fixes] material request's editable fields overriding with purchase common 2016-05-20 14:03:09 +05:30
Rushabh Mehta
532eedf411 [enhance] more editable grids 2016-05-19 18:22:49 +05:30
Rohit Waghchaure
29c7876e87 [Fixes] RFQ minor fixes 2016-05-11 19:38:29 +05:30
Anand Doshi
e00a20d99d Merge pull request #5284 from kickapoo/develop 
Add (optional) Country field to Buying.Supplier DocType (fixes #5223)
 2016-05-09 16:58:30 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Rushabh Mehta
1aa1c8a9ef [minor] remove hide_first in forms 2016-04-29 12:20:23 +05:30
Stavros Anastasiadis
5bd40db0ba Add (optional) Country field to Buying.Supplier DocType (fixes #5223) 
Most companies have a headquarter country;
 2016-04-28 18:06:45 +03:00
Rushabh Mehta
621283c5c5 [enhancement] stock balance page 2016-04-21 19:00:34 +05:30
Rushabh Mehta
202cb7cdf1 Merge pull request #5249 from nabinhait/fixed_asset 
Fixed asset
 2016-04-21 11:41:11 +05:30
Rushabh Mehta
02772442b6 [cleanup] added dashboard in project 2016-04-20 18:45:56 +05:30
Nabin Hait
3d9c5c0c20 Fixed Asset module cleanup and fixes 2016-04-20 17:57:11 +05:30
Rushabh Mehta
0525387328 [enhancement] added reserved_qty_for_production in bin and updated item dashboard 2016-04-18 19:27:46 +05:30
Nabin Hait
c46c1f0288 [fix] Rejected serial nos in purchase invoice 2016-04-18 17:46:36 +05:30
Nabin Hait
14aa9c5320 [fix] Cleanup and fixes in update stock feature in Purchase Invoice 2016-04-18 16:59:47 +05:30
Saurabh
130c57b201 [fixes] code clean-up 2016-04-18 15:58:43 +05:30
Saurabh
4bd34a58ba [fixes] fix perpetual inventory 2016-04-18 15:57:55 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Rushabh Mehta
15a7f215b9 [enhancement] heatmaps on item and notifications for item 2016-04-14 17:30:53 +05:30
Rushabh Mehta
0e2dd859b0 [cleanup] link dashboard for customer, supplier, item, employee and hide form by default 2016-04-13 17:22:09 +05:30
Rushabh Mehta
8bbca6fa2e [enhancement] links menu in customer, supplier, item 2016-04-12 19:16:33 +05:30
Rushabh Mehta
5d0e8dee11 [fix] dashboard for customer, supplier 2016-04-11 17:34:49 +05:30
Rohit Waghchaure
b2e7a1f605 [Fix] Default letter head 2016-04-11 17:30:44 +05:30
Rushabh Mehta
f16f9c569b [enhancement] add status in customer, supplier 2016-04-08 17:21:00 +05:30
Anand Doshi
e6e7cd90c9 Merge pull request #5143 from KanchanChauhan/somefixes 
[Minor Fixes] Findings in setting up erpnext
 2016-04-08 16:20:11 +05:30
Kanchan Chauhan
017d30f465 [Minor Fixes] Findings in setting up erpnext 2016-04-06 19:28:50 +05:30
Rushabh Mehta
78b7a53635 [cleanup] set default bold, print_hide for prints 2016-04-06 15:29:45 +05:30
Rushabh Mehta
d690094b12 [image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM 2016-04-04 16:57:56 +05:30
Nabin Hait
4f10f15686 [fix] Modified date changed in query report due to project field renaming 2016-04-01 17:59:06 +05:30
Rohit Waghchaure
e4b5fcb6e8 [Fix] Minor fix 2016-04-01 14:09:29 +05:30
rohitwaghchaure
62fea0374b [Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party 2016-03-31 21:49:07 +05:30
Rushabh Mehta
45c6b550f0 [cleanup] assets and made items mandatory in transactions 2016-03-31 15:37:51 +05:30
Nabin Hait
7fcec4118b [fix] Test case 2016-03-30 15:06:25 +05:30
Rushabh Mehta
7a1b5da830 [cleanup] request for quotation cleanup 2016-03-29 16:04:43 +05:30
rohitwaghchaure
f480f0fd1e [Fix] Minor changes 2016-03-28 18:52:59 +05:30
rohitwaghchaure
a1064a6149 [enhancement] request for quotation 2016-03-28 17:28:45 +05:30
rohitwaghchaure
44d0449895 [enhancement] request for quotation 2016-03-28 12:13:07 +05:30
Rushabh Mehta
c20c536f28 [fix] [wip] cleanup for collaborative pm 2016-03-25 17:22:17 +05:30
rohitwaghchaure
f3f2ecf968 [fixes] Set default company's letter head in purchase flow 2016-03-25 12:57:50 +05:30
Neil Trini Lasrado
240f629458 Validate purchase item only if material request type is purchase 2016-03-23 12:13:23 +05:30
Nabin Hait
c8baa01e9c [fix] Updated modified datetime 2016-03-21 17:20:03 +05:30
Nabin Hait
9a75530c26 [fix] reload doctype for renaming project 2016-03-18 16:19:25 +05:30
Nabin Hait
5996b2f1bb [fix] recurring document logic 2016-03-18 15:19:54 +05:30
rohitwaghchaure
90ff509f6d [fix]Earlier recurring billing 2016-03-18 10:44:53 +05:30
Nabin Hait
4f01704234 [fix] Fetch shipping address only if field exists 2016-03-17 19:14:53 +05:30
Nabin Hait
6221117069 [fix] shipping address position in document 2016-03-16 16:23:30 +05:30
Nabin Hait
cd6c09fbee [fix] shipping address in purchasee cycle 2016-03-16 16:23:30 +05:30
Saurabh
14d646f636 [fixes] shipping address on purchase flow 2016-03-16 16:23:30 +05:30
shreyas
7e2d7e88a6 [Partial]Some more changes to enable shipping address to be displayed in PO 2016-03-16 16:23:30 +05:30
shreyas
26bb6f37bc [Partial] Fix to add Shipping address in Purchase order 2016-03-16 16:23:29 +05:30
shreyas
77d23824df [Partial]Some more changes to enable shipping address to be displayed in PO 2016-03-16 16:23:29 +05:30
shreyas
22d26a1d82 [Partial] Fix to add Shipping address in Purchase order 2016-03-16 16:23:29 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
rohitwaghchaure
c54b805981 [fixes]Unable set recurring date in sales order 2016-03-14 19:03:22 +05:30
Valmik Jangla
836fd6450d Removed from Purchase Order and Supplier Quotation 2016-03-11 13:07:16 +05:30
Rushabh Mehta
1396b776bc [fix] print hide for submit_on_creation 2016-03-03 13:57:15 +05:30
Rushabh Mehta
7114b7786e [fix] print hide for submit_on_create 2016-03-03 13:12:21 +05:30
Rushabh Mehta
5839a8d7f0 [fixes] usability cleanup of recurring document and added explicit submit_on_creation 2016-03-02 17:51:52 +05:30
Rushabh Mehta
aac4dcedc8 [fix] print language and contact_email fields and removed translations 2016-03-02 15:45:09 +05:30
Rushabh Mehta
cbed331047 Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test 
Multilingual print format test
 2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92 [enhancement] Multi-lingual print format 2016-03-01 16:33:08 +05:30
ShashaQin
2f0a14bda0 Update purchase_order.json 2016-02-25 11:19:56 +08:00
Anand Doshi
acd1bcffde [fix] changed field type to Code 2016-02-24 12:38:08 +05:30
Nabin Hait
57b30430e4 Merge pull request #4695 from neilLasrado/develop 
Material Request of type Manufcture
 2016-02-24 12:30:53 +05:30
Nabin Hait
d2d261dc87 Merge pull request #4854 from patilsangram/develop 
Removed Stop Button from SO and PO
 2016-02-24 11:21:17 +05:30
patilsangram
a812d67837 [fixes] 2016-02-23 19:04:29 +05:30
Neil Trini Lasrado
dddf42560f Added code to update Material Request on Submission of Production Order 2016-02-23 18:35:44 +05:30
saurabh
42d5d8390d Resolved conflicts 2016-02-23 13:15:02 +05:30
saurabh
fb71f32ebf conflicts resolved 2016-02-23 02:26:37 +05:30
saurabh
2e2dd0fb42 Documentation of multilingual print format and minor fixes 2016-02-23 02:17:04 +05:30
saurabh
ca3e7152d6 removed add fetch method 2016-02-23 02:17:03 +05:30
saurabh
65820ed013 added new field language for users 2016-02-23 02:17:03 +05:30