shreyas
99e063f831
[Fix] Make purchase order item reqd_date modifiable after submit
2016-10-25 12:44:27 +05:30
Kanchan Chauhan
cce16b29b0
Group similar items in PO
2016-10-20 14:31:34 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Nabin Hait
f32547a414
Merge pull request #6637 from nabinhait/cost_center_fix
...
Set cost center while creating invoice from SO/PO
2016-10-18 15:18:16 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
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
saurabh
24358db7bf
changed fieldname from print_language to language
2016-02-23 02:17:02 +05:30
saurabh
648fd33576
removed languages filled methods, added this methods into new file
2016-02-23 02:17:02 +05:30
saurabh
5265aa43e4
added add_fetch method
2016-02-23 02:17:02 +05:30
saurabh
4db3b3cf1e
removed add_fetch method
2016-02-23 02:17:02 +05:30
saurabh
29d77be648
pulled languages into the field print language
2016-02-23 02:17:02 +05:30
saurabh
cc7c9e4d0f
on selection of supplier pulled default print language
2016-02-23 02:17:02 +05:30
saurabh
b1efceccd4
added field print languages
2016-02-23 02:17:02 +05:30
patilsangram
bf2b511988
[Removed Stop Button from SO and PO]
2016-02-22 16:24:23 +05:30
Nabin Hait
68eb689450
[fix] UOM fixed in Item-wise Purchase History report
2016-02-22 16:17:10 +05:30
saurabh
49c9746816
removed add fetch method
2016-02-19 11:46:28 +05:30
saurabh
a1c3ea2f86
added new field language for users
2016-02-19 11:46:28 +05:30
saurabh
2192ffe5af
changed fieldname from print_language to language
2016-02-19 11:46:28 +05:30
saurabh
6b6977a090
removed languages filled methods, added this methods into new file
2016-02-19 11:46:28 +05:30
saurabh
c14f2c29b9
added add_fetch method
2016-02-19 11:46:27 +05:30
saurabh
5d45176a1d
removed add_fetch method
2016-02-19 11:46:27 +05:30
saurabh
b4079095fb
pulled languages into the field print language
2016-02-19 11:46:27 +05:30
saurabh
3ec7649bae
on selection of supplier pulled default print language
2016-02-19 11:46:27 +05:30
saurabh
844cb5c810
added field print languages
2016-02-19 11:46:27 +05:30
Rushabh Mehta
10663ab37f
Merge pull request #4762 from nabinhait/multifixes3
...
Advance adjustment in invoice cannot be greater than grand total
2016-02-08 18:53:27 +05:30
Nabin Hait
4c6af87ad0
[fix] Read permission to All for permlevel 1 fields
2016-02-08 16:56:19 +05:30
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Nabin Hait
45805622e4
[fix] Serial no query in Quality Inspection
2016-02-08 11:06:59 +05:30
ShashaQin
8c63697f41
Update item_wise_purchase_history.json
2016-02-04 16:46:46 +08:00
Anand Doshi
7c0a58ac3f
[fix] show formatted currency value in advance paid validation
2016-01-29 12:16:24 +05:30
Nabin Hait
b2206d1155
[fix] Multi currency advance payment against Order
2016-01-27 15:43:24 +05:30
shreyas
f76853a8d9
[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen
2016-01-25 21:25:11 +05:30
shreyas
29b565fdf5
Added Disabled field to Supplier and Customer doctype
...
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
2016-01-25 18:19:13 +05:30
Anand Doshi
2ea5c6913d
Merge pull request #4685 from shreyasp/supplier-credit-fix
...
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 17:58:21 +05:30
Anand Doshi
39e2c2bb09
[fix] obey no_copy while creating recurring documents
2016-01-25 17:03:50 +05:30
shreyas
28a6578ba2
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 12:44:14 +05:30
Rushabh Mehta
b46069d44b
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
2016-01-15 16:59:26 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Nabin Hait
602683fdc0
Get last purchase rate button in Purchase Order
2016-01-06 16:03:58 +05:30
Anand Doshi
03e7e581d8
[minor] removed Communication table
2016-01-06 13:23:45 +05:30
Anand Doshi
e88ffe032e
[fix] show fields like sales_order, against_sales_order, schedule_date in item grid if In List View is checked
2016-01-06 12:54:59 +05:30
Rushabh Mehta
eb961370ff
[translations] fixes #4532
2016-01-04 15:48:37 +05:30
Nabin Hait
3505de037e
[fix] Update ordered qty in SO, if PO is made against SO
2015-12-30 15:03:34 +05:30
Nabin Hait
3769d87240
Additional Discount amount based on percentage
2015-12-18 13:12:08 +05:30
Anand Doshi
0f809426d2
[fix] Validate transfer qty cannot be greater than qty
2015-12-17 22:35:03 +05:30
Nabin Hait
694373d022
Fixed conflict
2015-12-08 15:30:15 +05:30
Saurabh
70ed6ede5c
[fixes] patch to update delivery status for drop ship item
2015-12-08 14:48:19 +05:30
Saurabh
01ca354d52
[fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status
2015-12-08 14:03:09 +05:30
Nabin Hait
a974ab3dc5
[fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier
2015-12-08 12:56:14 +05:30
Saurabh
4f39fd243e
[fixes] recreate print format, shipping address on po for drop ship, validate update stock
2015-12-06 10:09:06 +05:30
Nabin Hait
d793fc9446
[fix] Mapping allowed for negative quantity
2015-12-01 17:28:12 +05:30
Rushabh Mehta
29f9f6c147
[fixes] [ux] get product bundle items only on po, mr and button on toolbar
2015-12-01 11:36:22 +05:30
Nabin Hait
621f4cd7c9
[fix] Invoicing against drop-ship Purchase Order
2015-11-30 18:40:28 +05:30
Nabin Hait
72e348daf5
[fix] Show 'Make Purchase Receipt' button in PO even if all items are non-stock items
2015-11-30 16:26:49 +05:30
Nabin Hait
c4f4c09e42
Get Items from Product Bundle button in purchase cycle
2015-11-23 12:51:37 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Saurabh
2e292060c5
[fix] Reserved and ordered qty fix for drop ship orders
2015-11-18 17:39:26 +05:30
Saurabh
2c85efe31a
[fixes] hide drop ship section and typo
2015-11-18 17:39:26 +05:30
Saurabh
caf122f015
[fixes] dropship fixes
2015-11-18 17:39:25 +05:30
Anand Doshi
cea5479f4d
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
2015-11-12 18:39:57 +05:30
Rushabh Mehta
97426776bd
Merge pull request #4281 from nabinhait/address_fix
...
[fix] Clear addressed and contacts on a new form
2015-11-06 11:02:31 +05:30
Rushabh Mehta
d48c2394e8
[cleanup] drop ship testing & cleanup
2015-11-04 15:24:04 +05:30
Rushabh Mehta
5951692db0
[fix] cleanup stop-resume code
2015-11-03 18:20:39 +05:30
Saurabh
12ffd914ee
[fixes] args fixes
2015-11-02 16:10:09 +05:30
Rushabh Mehta
b1d8979a59
Merge pull request #4179 from saurabh6790/drop-shipping
...
Drop shipping
2015-11-02 15:43:48 +05:30
Saurabh
7cd0ba70d9
[fixes] typo error
2015-11-02 15:18:23 +05:30
Nabin Hait
66340f9894
[cleanup] Make Payment Entry from Order/Invoice
2015-11-02 14:40:47 +05:30
Nabin Hait
915778fb69
[fix] Clear addressed and contacts on a new form
2015-10-30 14:43:13 +05:30
Saurabh
6956eee790
[fixes] test case and code rewrite
2015-10-29 19:43:35 +05:30
Saurabh
2e65aadb1e
[fixes] reload doc after status update and supplier address fetching
2015-10-29 19:43:35 +05:30
Saurabh
653cffec1e
[change_log and fixes] set print hide, add change_log
2015-10-29 19:43:35 +05:30
Saurabh
cc8f1afa56
[fixes] test case fixes for drop shipping
2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32
[fixes] bulk close facility, rename Drop Ship to Delivered By Supplier
2015-10-29 19:43:35 +05:30
Saurabh
6d64fe378d
[fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1
2015-10-29 19:43:34 +05:30
Saurabh
a1f2aec918
[fixes] check ordered and reserved qrt, check closed status for so and po
2015-10-29 19:43:34 +05:30
Saurabh
8a8ef85174
[fixes] reviwe fixes
2015-10-29 19:43:33 +05:30
Saurabh
b705798ccb
[enhance & fixes] Print Format on PO for Drop Shipping
2015-10-29 19:43:33 +05:30
Saurabh
a4efbf0db7
[fixes] check for close status
2015-10-29 19:43:33 +05:30
Saurabh
1a9646739a
[fixes][rename-field-name] drop_ship to is_drop_ship
2015-10-29 19:43:32 +05:30
Saurabh
bd65cb8817
[fixes] field rename and test case for drop ship
2015-10-29 19:43:32 +05:30
Saurabh
98b287565a
[enhance] close purchase order
2015-10-29 19:43:32 +05:30
Saurabh
5b7e9a1c94
[minor fixes]
2015-10-29 19:43:31 +05:30
Saurabh
c306b21415
[merge fixes]
2015-10-29 19:43:31 +05:30
Nabin Hait
f9a974385a
[fix] Consider Rejected Qty for Qty validation in Purchase Receipt
2015-10-29 14:54:29 +05:30
Anand Doshi
21e09a2bd8
[enhancement] Ability to disable an Item
2015-10-29 12:39:47 +05:30
Anand Doshi
1d093a4039
[fix] change attach fields to small text
2015-10-19 12:56:29 +05:30
Anand Doshi
d665a07621
[fix] remove label 'Column Break'
2015-10-16 15:44:28 +05:30
Rushabh Mehta
ee6862b277
[fix] VARCHAR lengths as 140
2015-10-14 17:28:35 +05:30
Anand Doshi
71ebad5668
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
2015-10-14 16:13:49 +05:30
Rushabh Mehta
d10ba853e6
[fix] sales & purchase order status
2015-10-02 17:16:51 +05:30
Anand Doshi
21f6ea6f7e
[hotfix] remove allow on submit from item tables
2015-09-30 18:45:29 +05:30
Anand Doshi
da98ab6f3c
[fix] Only 1 account per company for a party
2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f
[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
2015-09-30 15:11:12 +05:30
Anand Doshi
b6ec680c46
[fix] round percentages in get_indicator
2015-09-22 16:36:20 +05:30
Nabin Hait
77ca80217c
[fix] Account Currency and Balance fixed in chart of accounts #4019
2015-09-17 14:43:33 +05:30
Nabin Hait
87c2d1d634
[fix] Dashboard info in accounting currency for Customer and Supplier #4017
2015-09-17 14:16:01 +05:30
Anand Doshi
71e51c179c
[fix] changed modified for multi-currency sync
2015-09-11 16:55:11 +05:30
Anand Doshi
5d9cfc76cd
Don't copy title field in Duplicate
2015-09-11 15:35:26 +05:30
Rushabh Mehta
d461d462aa
[minor] rename notified_modifed > notified_update. Merge with #1296
2015-09-11 15:34:41 +05:30
Nabin Hait
2377cdfa4e
Fixed conflict
2015-09-09 18:45:41 +05:30
Anand Doshi
bc1e8b4408
[minor] Unset Apply User Permissions in default permissions
2015-09-08 19:23:23 +05:30
Nabin Hait
1609933748
Test cases for multi currency
2015-09-03 16:03:07 +05:30
Nabin Hait
98096771c2
[multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that
2015-09-03 10:28:08 +05:30
Nabin Hait
76bb927337
Fixed conflict
2015-08-31 17:28:05 +05:30
Nabin Hait
6e439a5e53
Multi currency: test case and fixes
2015-08-28 19:24:22 +05:30
Anand Doshi
3d9d2d1dd1
Exported all doctypes
2015-08-27 17:04:39 +05:30
Anand Doshi
3ea7ce84ed
[fix] print hide additional discount, reload doctypes in sales return patch
2015-08-27 17:04:39 +05:30
Anand Doshi
57a51351d3
[fix] Changed more section label to 'More Information'
2015-08-27 17:04:06 +05:30
Rushabh Mehta
c5346c99de
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-27 17:03:37 +05:30
Nabin Hait
78be566428
minor fix
2015-08-27 16:27:44 +05:30
Nabin Hait
13d8835b75
Fixed merge conflict
2015-08-27 14:55:34 +05:30
Nabin Hait
2091f0c97e
Checked out json files from upstream
2015-08-27 14:35:17 +05:30
Anand Doshi
282e4947fa
[fix] Changed more section label to 'More Information'
2015-08-27 13:11:46 +05:30
Nabin Hait
4ffd7f3d05
Outstanding, paid and write-off amount in Invoice
2015-08-27 12:28:36 +05:30
Anand Doshi
b99c180466
Merge branch 'rmehta-validation-settings' into develop
2015-08-27 12:22:06 +05:30
Nabin Hait
35a5c87cbf
[fix] Clear notifications for Sales / Purchase Order on stop/unstop
2015-08-27 12:06:11 +05:30
Rushabh Mehta
740db53b86
[fix] returned_qty reapply and change-log
2015-08-27 12:00:16 +05:30
Anand Doshi
69b6195d3b
Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
2015-08-27 11:39:20 +05:30
Rushabh Mehta
00eba4d7f6
[minor] show price list in sales order (via support ticket)
2015-08-27 10:25:07 +05:30
Rushabh Mehta
17679c6902
[layout cleanup] purchase, stock, journal entry
2015-08-26 22:20:38 +05:30
Rushabh Mehta
b8a6f40370
[cleanup] layouts of item, customer, supplier, lead
2015-08-26 10:51:45 +05:30
Anand Doshi
fe13bfed44
Fixes to Return Improvements pull request
...
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
2015-08-25 19:07:04 +05:30
Rushabh Mehta
3c107cdbf8
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-25 14:26:42 +05:30
Nabin Hait
3f321ebfde
utilities/repost_stock file renamed to stock/stock_balance
2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8
Update delivered / ordered qty in sales/purchase order from return entry
...
Reserved Qty logic cleaned up
2015-08-25 14:11:12 +05:30
Rushabh Mehta
c8a5a2cc4a
[hot] make_stock_entry button in purchase order
2015-08-24 13:12:45 +05:30
Nabin Hait
c561a499d7
Multi currency GL entry fixes
2015-08-21 14:31:47 +05:30
Nabin Hait
6aea1c0da5
Currency validation in gl entry
2015-08-21 14:31:46 +05:30
Rushabh Mehta
81e9d4e8f5
[fix] changed text > text editor for description fields in tables
2015-08-19 13:00:03 +05:30
Rushabh Mehta
1d1f1b06d9
[minor] notify stop/unstop
2015-08-18 17:26:50 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Nabin Hait
246e47e76e
[fix] Dashboard in customer / supplier
2015-08-10 14:07:02 +05:30
Nabin Hait
d46fb5eb8c
Merge pull request #3743 from rmehta/indicator-fix
...
[fix] indicators for sales order, purchase order #3736
2015-07-29 15:53:44 +05:30
Rushabh Mehta
2f3b097d63
[fix] indicators for sales order, purchase order #3736
2015-07-29 13:08:27 +05:30
Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Neil Trini Lasrado
3698b84d7c
Typo fixes in Supplier and Customer Document
2015-07-28 12:17:02 +05:30
Neil Trini Lasrado
3fbbb71afc
Added ability to freeze Customer/Supplier
2015-07-28 12:17:02 +05:30
Nabin Hait
b71471fcb5
minor fix
2015-07-27 17:09:07 +05:30
Nabin Hait
3cf67a462b
Cleanup and test cases for serialized item
2015-07-24 13:26:54 +05:30
Nabin Hait
1d21842f68
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
2015-07-24 13:26:53 +05:30
Rushabh Mehta
94157334a7
[rename] Material User > Stock User
2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
fe2ffaeafa
Fixes in Production Planning Tool
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
09a66c4201
Fixed issue with Customer Contacts in Transaction Documents
2015-07-13 12:41:27 +05:30
Rushabh Mehta
85e6f5d04e
[fix] [minor] fix customer_name, supplier_name labels
2015-07-03 12:59:08 +05:30
Neil Trini Lasrado
e2d8dd0663
added recurring print format to sales/purchase invoice and order
2015-06-29 12:50:41 +05:30
Nabin Hait
7c5ba957ac
Label changed for discount amount in base currency
2015-06-15 15:47:07 +05:30
Neil Trini Lasrado
42c1836db5
function changed to add fetch
2015-06-08 13:09:11 +05:30
Neil Trini Lasrado
9dbdef3bd5
added code to fetch item name and desc on change of item code
2015-06-08 12:29:12 +05:30
Nabin Hait
c6d8121f4a
delete fields inline description
2015-06-03 11:24:37 +05:30
Nabin Hait
c87595b2da
show item description in item grid view if marked for 'In List View'
2015-06-03 11:24:37 +05:30
Rushabh Mehta
99b18224f5
[minor] remove order_by in listview, let user customize
2015-05-29 12:48:24 +05:30
Rushabh Mehta
69fb13f229
[cleanup] rename discount and reserver warehouse #3325
2015-05-27 12:20:07 +05:30
Nabin Hait
e2968e9893
minor fixes in test cases
2015-05-22 17:25:55 +05:30
Pratik Vyas
1a84d8ecd2
Merge branch 'develop'
2015-05-19 12:23:52 +05:30
Rushabh Mehta
9dd8aab211
[fix] status updater
2015-05-18 11:19:10 +05:30
Nabin Hait
f78283fbff
customer and supplier dashboard info
2015-05-15 16:58:51 +05:30
Nabin Hait
a6ee8290ce
Inclusive tax for deduction and manipulation of tax amount to fix rounding issue
2015-05-15 12:02:27 +05:30
Nabin Hait
90fc19ed9a
Item image in print view
2015-05-14 12:32:26 +05:30
Nabin Hait
7a9646959a
Allowed purchase order in different uom than in Material request
2015-05-13 12:42:29 +05:30
Rushabh Mehta
009378e187
[rename]
2015-05-06 22:59:00 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Nabin Hait
9dd9150d2c
fix for duplicate item
2015-05-01 16:41:15 +05:30
Nabin Hait
7981ea0e6c
duplicate item message
2015-05-01 11:10:37 +05:30
Nabin Hait
4ffee99ba3
Removed duplicate item validation
2015-04-30 16:13:46 +05:30
Nabin Hait
acfdce6ade
Removed duplicate item validation
2015-04-30 11:51:24 +05:30
Rushabh Mehta
45ca8a4d31
[minor] save last company in multi-company scenario
2015-04-28 16:04:56 +05:30
Nabin Hait
042f86e555
advance paid should not be copied and patch to fix affected records
2015-04-28 13:00:23 +05:30
Nabin Hait
3c3855ac8c
advance paid should not be copied and patch to fix affected records
2015-04-27 11:25:56 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Nabin Hait
c3daa91c8a
Reset no-copy fields for recurring docs and patch to fix
2015-04-16 13:13:18 +05:30
Rushabh Mehta
3ee1f11771
[cleanup] quality inspection fixes #3061
2015-04-14 17:53:36 +05:30
Anand Doshi
22af7deadd
minor fixes
2015-04-05 17:18:07 +05:30
Rushabh Mehta
aefc01372f
[listview] issue: open, close | so, po: stop, unstop
2015-03-31 13:39:42 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Nabin Hait
da5cfb1630
Exchange rate upto 9 decimals
2015-03-23 14:51:45 +05:30
Nabin Hait
ca7e778f82
modified date updated
2015-03-23 14:17:59 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Nabin Hait
c8c1d1c693
Test case fixes
2015-03-13 08:14:45 +05:30
Rushabh Mehta
f5f0d5a83a
[breadcrumbs] refactor
2015-03-09 15:48:16 +05:30
Anand Doshi
e514323be4
load all js and css like before in desk.html
2015-03-06 13:17:26 +05:30
Nabin Hait
b50833a1e8
Fields alignment
2015-03-04 16:14:02 +05:30
Rushabh Mehta
e693f794f5
[subcontract] refactor, make stock entry from PO
2015-03-03 15:50:24 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
8be6939288
help description for party account
2015-02-26 12:31:07 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Nabin Hait
7ce2f55ca9
print_hide for total_taxes_and_charges in buying
2015-02-24 16:06:14 +05:30
Nabin Hait
903c42a130
multiplefixes
2015-02-24 15:24:49 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8
Fields added in all sales and purchase doctypes
2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60
Validate taxes and charges input, commonified
2015-02-24 10:02:28 +05:30
Nabin Hait
ce24512ed7
Commonified sales/purchase taxes and charges master.js code
2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf
Taxes and totals calculation in party currency
2015-02-24 10:02:27 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
e8a37949cf
[issue fixes] + added fixtures for item attribute and operation
2015-02-20 20:10:11 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
c7a11cc451
[usability] [fixes] stock entry and production order
2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Rushabh Mehta
614e7ab757
[cleanup] SMS, and added item filter in stock balance
2015-02-18 19:51:48 +05:30
Nabin Hait
8626d3881d
fixed renaming patch
2015-02-18 15:10:29 +05:30