Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6
Fixed issues
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5
Fiscal year autofetch added
2014-10-09 15:01:12 +05:30
ankitjavalkarwork
1b2944e871
Rearrange To/From, Recurring Type field for better UX
2014-10-08 14:24:58 +05:30
Rushabh Mehta
724f9e57e3
[item-variants] get table values from template if not set in variant #2224
2014-10-07 15:29:58 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
e2095c0dd7
Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type
...
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
2014-10-06 13:12:05 +05:30
Nabin Hait
e9daefe07f
Credit Limit and credit days fixes #2031
2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
ankitjavalkarwork
9e5f319d80
[ #2253 ] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO
2014-10-06 12:58:38 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Anand Doshi
1394509343
Fixes for recurring document
2014-09-21 19:45:49 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
2014-09-16 15:12:18 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Sambhaji Kolate
525ab0a925
fix build
2014-09-15 12:57:58 +05:30
Sambhaji Kolate
930e7f5578
fix conflict
2014-09-15 12:43:48 +05:30
Sambhaji Kolate
d14e15d432
fix conflict
2014-09-15 12:31:44 +05:30
Sambhaji Kolate
4d3a18890b
fix conflict
2014-09-15 12:20:11 +05:30
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
Anand Doshi
61a591944b
[minor] ui/ux fixes in Payment Tool
2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817
Payment Tool #2106
2014-09-12 15:23:46 +05:30
Anand Doshi
2f9c36a588
Merge pull request #2175 from ankitjavalkarwork/fix2153
...
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-11 16:47:08 +05:30
Sambhaji Kolate
b14401c320
change convert_to_recurring() to take recurring_id dynamicaly
2014-09-11 16:09:05 +05:30
ankitjavalkarwork
5e34383e25
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-10 17:54:42 +05:30
Sambhaji Kolate
b2a3f2d386
some minor changes get fixed for PO/PI
2014-09-10 17:40:48 +05:30
Sambhaji Kolate
6b679c45df
Updated purchase_invoice.json and purchase_order.json with some missed out changes
2014-09-10 13:57:45 +05:30
Sambhaji Kolate
e3d2643f2b
Changes for Recurring PO/PI
2014-09-10 13:07:59 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Anand Doshi
45c9b1c065
[minor] Set in_list_view for Sales and Purchase item tables
2014-09-08 17:42:17 +05:30
Anand Doshi
43f087c99d
[hotfix] Supplier read permission for Purchase User
...
[Fix] Issue #448
[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Anand Doshi
c147667486
[hotfix] Supplier read permission for Purchase User
2014-08-26 14:26:07 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Nabin Hait
dcce0c86ed
Minimum ordered qty validation
2014-08-18 15:40:36 +05:30
Rushabh Mehta
c31a1eec5b
[ux] fixes to timeline
2014-08-14 11:47:31 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Nabin Hait
c85abbfeca
PO-PI mapping: divisional loss issue fixed
2014-08-08 16:07:02 +05:30
Anand Doshi
03eadb74ab
Fixes to microtemplate feature
2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5
more updates to lists and started sane filters
2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015
added listviews for sales, purchase
2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a
built item grids for sales, purchase, stock
2014-08-08 11:56:31 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
Nabin Hait
1279f1d430
Fixes for customer / supplier renaming
2014-08-04 13:05:59 +05:30
Anand Doshi
fbe37c9158
Labels: Use Date instead of Posting Date
2014-07-31 14:31:25 +05:30
Anand Doshi
627f13ea26
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
2014-07-30 13:09:01 +05:30
Anand Doshi
9c018fe984
[minor] Fixed address listing
2014-07-28 12:59:52 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
nabinhait
d5fb5d91e9
overflow validation fixed
2014-07-10 15:27:27 +05:30
nabinhait
8e4fcca216
Get query fixes in address in contact listing. Fixes #1911
2014-07-09 12:50:50 +05:30
nabinhait
ff2cc1626e
Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list
2014-07-08 15:30:25 +05:30
Anand Doshi
484b092720
BugFix in Purchase Order: Validate minimum order qty using Qty in Stock UOM
2014-07-07 14:03:26 +05:30
Anand Doshi
dffec8fb85
Reapply Price List on Change
2014-07-04 15:44:48 +05:30
Anand Doshi
c33ae0c7df
Minor fix: commonified message.
2014-07-01 16:27:24 +05:30
Anand Doshi
83da92fdcc
Naming Series Property Setter Patch
2014-06-23 18:04:07 +05:30
Nabin Hait
444f956e7b
Pricing Rule fixes and improvements. Fixes #1795
2014-06-20 16:00:45 +05:30
Rushabh Mehta
ba83e9cfbe
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-05 17:56:42 +05:30
Anand Doshi
ec8240e890
Apply User Permissions optional in Script and Query Reports
2014-06-04 17:48:58 +05:30
Anand Doshi
a8ce570635
Permission relogication continued
2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7
Started permission relogication
2014-06-04 17:48:52 +05:30
Anand Doshi
ffc28faa51
Merge pull request #1744 from rmehta/develop
...
added multiple item select and allow non purchase items in Material Requ...
2014-06-04 17:47:58 +05:30
Rushabh Mehta
b6843f2087
added multiple item select and allow non purchase items in Material Request of type transfer
2014-06-04 13:10:41 +05:30
Nabin Hait
b15764ef2c
Translation issue fixed in analytics/grid report
2014-06-03 13:02:39 +05:30
Nabin Hait
0984f227a8
minor fixes related to path
2014-05-30 19:10:12 +05:30
Nabin Hait
0be378af6a
Purchase ordered qty can not be less than minimum order qty. fixes #1529
2014-05-30 15:53:20 +05:30
Nabin Hait
8de61559b0
Minor fixes in sales / purchase analytics. Fixes #1701
2014-05-30 11:22:11 +05:30
Nabin Hait
a3dd72a759
Pricing Rule
2014-05-30 11:22:10 +05:30
Rushabh Mehta
f944e819e9
fixes #1581 and added icons to grid reports
2014-05-27 15:22:04 +05:30
Anand Doshi
54b7962eb9
Pass frm to open_mapped_doc
2014-05-14 17:38:45 +05:30
Anand Doshi
4c83e407a9
Changed Print Format files to lowercase
2014-05-13 17:58:30 +05:30
Nabin Hait
aade34b0c9
Reports and print formats modified for renamed fields
2014-05-13 16:12:37 +05:30
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Nabin Hait
344f4436f1
Create / update raw materials supplied table for sub-contracting
2014-05-08 19:08:20 +05:30
Nabin Hait
3c5bc544ea
Serial no and batch no field added in purchase receipt item supplied table
2014-05-08 19:07:02 +05:30
Anand Doshi
f410bd9bf9
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
...
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Anand Doshi
8c2dbab878
Changed default naming series options
...
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Anand Doshi
69a2c25ca5
Fixed set_query
2014-04-25 18:35:45 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +05:30
Anand Doshi
b054eb7a4f
Call calculate_taxes_and_totals after mapping
2014-04-22 20:35:22 +05:30
Anand Doshi
3e41fd1fd3
List route for tree browser based doctypes; Fixes to add child in tree browsers
2014-04-22 18:55:21 +05:30
Anand Doshi
cbbf451974
Fixes throw
2014-04-21 11:33:49 +05:30
Rushabh Mehta
ff93802d58
more message fixes
2014-04-15 18:40:31 +05:30
Rushabh Mehta
8a40c136ce
more message fixing
2014-04-15 16:31:20 +05:30
Pratik Vyas
f37d6fe32b
Merge pull request #1514 from frappe/js-translate-refactor
...
JS translation refactor
2014-04-15 11:44:16 +05:30
Rushabh Mehta
9f0d625300
update translation strings #1403
2014-04-14 19:20:45 +05:30
Pratik Vyas
b52618c142
frappe._ to __
2014-04-14 16:25:30 +05:30
Anand Doshi
13ae548ff6
Fixes for model-cleanup frappe/frappe#478
2014-04-10 18:43:07 +05:30
Anand Doshi
9fd50bcfb6
Fixed rest of the test cases frappe/frapp#478
2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d
Fixed Test Cases frappe/frappe#478
2014-04-08 20:15:22 +05:30
Nabin Hait
dc82d4f0cd
frappe/frappe#478 fixes
2014-04-07 12:02:57 +05:30
Nabin Hait
e7885e3ee0
frappe/frappe#478 replaced doclist in testcases
2014-04-04 13:26:50 +05:30
Nabin Hait
312ba99e71
frappe/frappe#478 fixes
2014-04-04 11:06:10 +05:30
Nabin Hait
365ae27acf
frappe/frappe#478 fixes
2014-04-03 17:38:54 +05:30
Rushabh Mehta
f14b809ab5
frappe/frappe#478 , more changes, removed bean
2014-04-03 14:30:42 +05:30
Rushabh Mehta
f191f854cd
frappe/frappe#478 erpnext install works
2014-04-02 18:09:34 +05:30
Anand Doshi
5b552b51f1
frappe/frappe#478
2014-04-02 15:03:35 +05:30
Rushabh Mehta
f2227d033c
frappe/frappe#478 , removed instances of .fields
2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58
frappe/frappe#478 added test_records.json
2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2
frappe/frappe#478 , frappe tests pass, .txt renamed to .json
2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9
frappe/frappe#478
2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc
frappe/frappe#478
2014-03-28 16:57:21 +05:30
Rushabh Mehta
b385ecf65e
frappe/frappe#478
2014-03-28 16:54:45 +05:30
Anand Doshi
81ba0b29da
frappe/frappe#478
2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28
Replaced doc, doc.fields frappe/frappe#478
2014-03-28 13:55:00 +05:30
Anand Doshi
40534f076b
Changed creation, modified format frappe/frappe#478
2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608
frappe/frappe#478
2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a
frappe/frappe#478
2014-03-27 17:51:41 +05:30
Rushabh Mehta
d2b34dc30c
frappe/frappe#478
2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0
#478
2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf
refactored client side Model and Meta - frappe/frappe#478
2014-03-26 18:24:30 +05:30
Nabin Hait
4d713ac5ba
sql injection fixes
2014-03-21 11:22:37 +05:30
Anand Doshi
4b2692182a
Fixes after change in fields handling in Document
2014-03-19 16:58:42 +05:30
Anand Doshi
09a9f4c0c9
Added module to Report doctype
2014-03-07 17:20:22 +05:30
Rushabh Mehta
0fabc6a841
minor fix
2014-03-06 11:19:46 +05:30
Anand Doshi
f5794f1c07
Module Home Pages using Module View
2014-03-03 15:06:34 +05:30
Nabin Hait
08222150f2
Pricing Rule fixes and reference field in all item table
2014-02-28 13:02:00 +05:30
Anand Doshi
e9baaa68e7
Changed frappe.conn to frappe.db
2014-02-26 12:35:33 +05:30
Nabin Hait
f5bb9ae1b1
default value in single doctypes
2014-02-19 19:02:40 +05:30
Rushabh Mehta
793ba6bd37
-webnotes +frappe 💥
2014-02-14 15:47:51 +05:30
Nabin Hait
a038831c45
validate item of item_price record
2014-02-13 15:54:51 +05:30
Nabin Hait
66b2717c54
Merge pull request #1414 from akhileshdarjee/4.0-hotfix
...
Customer and Supplier dashboard set to company currency
2014-02-12 16:55:17 +05:30
Nabin Hait
139dc7b9b2
minor fixes
2014-02-12 14:54:16 +05:30
Nabin Hait
0aa71a5c41
minor fixes
2014-02-12 14:54:15 +05:30
Nabin Hait
5f59726903
Rename fields: replaced in html and txt files
2014-02-12 14:54:15 +05:30
Nabin Hait
1eb560130a
Rename fields: amount related fields
2014-02-12 14:54:14 +05:30
Nabin Hait
7979f7ed21
Field Rename: rate field mass replacement
2014-02-12 14:54:14 +05:30
Nabin Hait
a7f757a3f4
Rename fields: initial commit
2014-02-12 14:54:13 +05:30
Nabin Hait
777397489e
Fields renamed in schema
2014-02-12 14:54:13 +05:30
Nabin Hait
436f526102
commonify get_item_details and rename fields to sync selling and purchase
2014-02-12 14:54:12 +05:30
Akhilesh Darjee
f2b7cd65a9
customer and supplier dashboard set to company currency
2014-02-12 11:29:08 +05:30
Anand Doshi
d7cc47e3ac
Do not validate Material Request against Sales Order, Moved Setup page to Framework
2014-02-10 17:39:12 +05:30
Nabin Hait
574c7e7c63
item related cleanup
2014-02-06 15:51:01 +05:30
Rushabh Mehta
cc008cc109
commonified get_party_details
2014-02-03 16:14:56 +05:30
Rushabh Mehta
347889b233
merge
2014-02-03 14:49:53 +05:30
Nabin Hait
23c28704d2
Field arrangement in child table
2014-02-03 14:36:59 +05:30
Akhilesh Darjee
b665d86292
patch to reload all sales and purchase doctypes and print formats
2014-01-29 17:40:34 +05:30
Akhilesh Darjee
4f7215662d
webnotes/erpnext#1090 set default tax type in customer and supplier
2014-01-29 16:31:38 +05:30
Rushabh Mehta
24da761a17
more updates to party
2014-01-29 15:26:04 +05:30
Akhilesh Darjee
2ced3b07d4
changed fieldname from charge to taxes
2014-01-28 19:16:05 +05:30
Rushabh Mehta
49dd7bee87
added get_supplier_details and commonified invoice functions
2014-01-28 17:43:10 +05:30
Nabin Hait
21d324c597
Merged with 4.0-wip
2014-01-28 15:52:25 +05:30
Anand Doshi
cb39e0878e
Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
...
Conflicts:
config.json
erpnext/accounts/utils.py
erpnext/patches/patch_list.py
erpnext/stock/doctype/price_list/price_list.txt
erpnext/stock/doctype/warehouse/warehouse.py
portal/templates/sale.html
portal/utils.py
selling/doctype/sales_order/templates/pages/order.py
selling/utils/cart.py
selling/utils/product.py
utilities/demo/demo_docs/Fiscal_Year.csv
utilities/demo/make_demo.py
2014-01-24 21:44:36 +05:30
Nabin Hait
4ba95d0b7a
Fix in testcases
2014-01-23 16:45:22 +05:30
Rushabh Mehta
f96bcf943b
added explicit delete perimssions
2014-01-20 17:52:13 +05:30
Nabin Hait
5c6d13a0df
Fixed conflict while merging with develop branch
2014-01-20 17:18:16 +05:30
Nabin Hait
dc15b4fa8a
Fixed conflict while merging with develop brnach
2014-01-20 16:48:49 +05:30
Akhilesh Darjee
57738a0ff3
flat discount replaced to discount amount
2014-01-03 18:15:07 +05:30
Rushabh Mehta
b09d9dabc5
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
2014-01-02 11:47:23 +05:30
Akhilesh Darjee
d203aea7c2
[flat discount] flat discount implemented on sales cycle
2013-12-27 17:49:57 +05:30
Anand Doshi
8e332ffd16
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
...
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
2013-12-26 19:12:51 +05:30
Rushabh Mehta
54047780fc
Merge with 3.3.8
2013-12-26 11:07:46 +05:30
Rushabh Mehta
6de403f2be
added manifest, hooks and fixed requires webnotes/wnframework#351
2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d
install, web serving, session booting webnotes/wnframework#351
2013-12-12 19:12:19 +05:30
Rushabh Mehta
afea58b7a1
moved modules inside erpnext folder
2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d
moved directory structure
2012-09-24 19:13:42 +05:30
Rushabh Mehta
09d84b6575
Stock Ageing & release of Analytics
2012-09-21 19:46:24 +05:30
Anand Doshi
06f4c1a55f
if last purchase not found, take last purchase rate from item
2012-09-19 11:29:32 +05:30
Anand Doshi
8c3cfe076e
get last purchase rate from item if not found from purchase order or receipt
2012-09-18 13:56:47 +05:30
Anand Doshi
ce946afb67
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
public/js/all-app.js
2012-09-10 14:18:17 +05:30
Nabin Hait
6c8504877b
Fixes in item wise purchase details report
2012-09-10 12:23:06 +05:30
Anand Doshi
f03e3bb06b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-06 07:55:19 +05:30
Anand Doshi
e642805882
changed date displayed in transaction listing from modified date to transaction/posting date
2012-09-03 13:32:25 +05:30
Anand Doshi
5fc48f566f
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
2012-08-17 11:48:34 +05:30
Nabin Hait
daba7c40a6
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-17 11:00:42 +05:30
Nabin Hait
0170b2b4bc
default purchase taxes and charges master will be automatically fetched in pur transactions
2012-08-17 11:00:15 +05:30
Anand Doshi
6547375a2b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/buying/doctype/purchase_common/purchase_common.js
2012-08-10 15:42:50 +05:30
Anand Doshi
544b0f64d1
cascade project name to other items, if selected in one item during purchase cycle
2012-08-10 15:37:54 +05:30
Anand Doshi
7b64b96676
renamed report folder
2012-08-07 15:30:40 +05:30
Anand Doshi
26dc1b776a
fix in report: supplier quotations after merge with unicode
2012-08-07 15:17:53 +05:30
Anand Doshi
16ad50f641
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/stock/doctype/item/item.txt
2012-08-07 15:07:56 +05:30
Anand Doshi
e30d5f833e
New Report: Supplier Quotations
2012-08-07 15:05:42 +05:30
Anand Doshi
b8219aa4f0
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
public/js/all-app.js
public/js/fields.js
2012-08-06 19:55:43 +05:30
Anand Doshi
3e92c00dd9
removed stock uom related fields from supplier quotation item, as there is no need to track stock uom details in a suppleir quoation
2012-08-06 18:29:46 +05:30
Anand Doshi
793ec9f857
removed method get_uom_details from Supplier Quotation, as there is no need to track Stock UOM in a quotation
2012-08-06 18:29:03 +05:30
Anand Doshi
6ea82c07fe
added button, method in Purchase Request form to make Supplier Quotation
2012-08-06 18:27:58 +05:30
Anand Doshi
72f5a05ac0
added fields 'Supplier Quotation' and 'Supplier Quotation Item' in Purchase Order Item to track parent
2012-08-06 18:27:11 +05:30
Anand Doshi
b6029d2d13
added button, method in Purchase Order to fetch Supplier Quotation Items
2012-08-06 18:26:07 +05:30
Anand Doshi
da85a8363f
call set missing values on load and contact section toggle on refresh of purchase order form
2012-08-06 18:24:56 +05:30
Anand Doshi
280e0ce263
added function to hide/unhide contact section of a buying form
2012-08-06 18:23:45 +05:30
Anand Doshi
41c4d19279
added button to make Purchase Order from Supplier Quotation
2012-08-06 18:22:59 +05:30
Anand Doshi
26e5f3dec0
DocType Mappers: Purchase Request-Supplier Quotation and Supplier Quotation-Purchase Order
2012-08-06 18:20:08 +05:30
Anand Doshi
e64d900322
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
2012-08-06 13:23:16 +05:30
Rushabh Mehta
49dc5da0dc
refactor unicode changes and merge with master with refactored email
2012-08-03 16:02:24 +05:30
Anand Doshi
3d549775e1
mark 'Supplier Quotation' as a beta feature
2012-08-03 14:19:05 +05:30
Anand Doshi
a67a74fee1
supplier quotation, project shift patch
2012-08-02 18:53:00 +05:30
Anand Doshi
486f9dfcec
added unicode_literals import at start of each file
2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb
Merge branch 'master' of github.com:webnotes/erpnext into dev
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
public/js/all-app.js
2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673
Changed file names from listview.js to doctype_name_list.js
2012-07-18 20:25:58 +05:30
Anand Doshi
f2f5c94c41
Default Currency specification for Customer and Supplier
...
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
2012-07-18 20:13:52 +05:30
Nabin Hait
a25ebe3dbf
Conversion rate fieldtype set as float (from currency)
2012-07-16 16:34:28 +05:30
Anand Doshi
d383e573fc
contact, address list views and allow their deletion from customer / supplier form
2012-07-02 19:45:35 +05:30
Anand Doshi
8c7cd2c407
Merge branch 'master' of github.com:webnotes/erpnext into dev
2012-07-02 14:44:05 +05:30
Nabin Hait
84a2e546de
po date should be greated than equal to pur request date
2012-07-02 11:13:48 +05:30
Anand Doshi
1f69f92d2f
supplier part number in purchase order
2012-06-29 13:25:08 +05:30
Anand Doshi
e301e8a6c1
Merge branch 'master' into dev
...
Conflicts:
erpnext/buying/doctype/quality_inspection/quality_inspection.py
2012-06-28 18:40:57 +05:30
Nabin Hait
1bf92fe034
update modified time of GRN while updating QA no in GRN
2012-06-27 14:50:14 +05:30
Anand Doshi
81fa802e09
Merge branch 'master' into dev
2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf
fixes related to --> clear locals and then sync locals when whole doclist is passed
2012-06-25 20:05:35 +05:30
Nabin Hait
486718250e
listview of purchase invoice and deletion of supplier
2012-06-22 14:14:04 +05:30
Nabin Hait
785fe9abc4
validation changed in supplier
2012-06-18 12:43:25 +05:30
Rushabh Mehta
4c56275d26
appframe is now heading
2012-06-14 11:05:09 +05:30
Anand Doshi
0146ddcfc6
delete communication log for supplier and customer, on trash
2012-06-12 14:09:44 +05:30
Anand Doshi
3b6eda3b45
fix in listviews of lead, customer and supplier
2012-06-12 13:08:57 +05:30
Anand Doshi
a6708fb748
new doctype: communication
2012-05-31 14:53:55 +05:30
Anand Doshi
82695ddd90
fixes in transaction history of customer and supplier
2012-05-29 14:14:27 +05:30
Anand Doshi
e012f06452
fix in purchase order validate currency's error messages, production order's produced qty field marked as no copy
2012-05-28 19:05:52 +05:30
Anand Doshi
9327bb9585
fix in tag viewing in doclistview
2012-05-23 15:12:22 +05:30
Nabin Hait
86375f089a
Merge branch 'shf_rename'
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-21 15:48:21 +05:30
Nabin Hait
fec3f783af
custom field included in docfield query
2012-05-21 14:40:25 +05:30
Anand Doshi
1aae261490
delete button in doclistview
2012-05-21 14:31:03 +05:30
Anand Doshi
00175612ac
Merge branch 'shf_rename'
...
Conflicts:
erpnext/stock/doctype/item/listview.js
2012-05-18 16:50:35 +05:30
Anand Doshi
d49da9bff1
new listviews
2012-05-18 16:49:36 +05:30
Anand Doshi
c51c0d38d7
Merge branch 'shf_rename'
2012-05-16 12:28:14 +05:30
Nabin Hait
86dec8da7a
naming series issue fixed in pos settings
2012-05-16 12:20:21 +05:30
Rushabh Mehta
deeae62b18
merge js/css
2012-05-14 15:03:17 +05:30
Anand Doshi
07af8f6247
fix in last purchase rate
2012-05-14 13:02:31 +05:30
Anand Doshi
314c202340
more changes to last purchase rate
2012-05-11 18:38:11 +05:30
Anand Doshi
cec150b487
fixes in last purchase rate
2012-05-11 18:13:53 +05:30
Rushabh Mehta
0eb790a0ae
cleaned up imports, doc
2012-05-11 15:53:37 +05:30
Nabin Hait
6fb498ebcd
changed field position of net total(import)
2012-05-10 14:03:39 +05:30
Rushabh Mehta
078867c411
fixes to listview
2012-05-09 16:15:51 +05:30
Rushabh Mehta
a920943e43
new cms with public folder
2012-05-07 18:00:57 +05:30
Nabin Hait
796505a83e
field arrangement in purchase and stock cycle
2012-05-01 16:26:16 +05:30
Nabin Hait
a6b7886175
resolved conflict while merging with master
2012-04-26 13:02:36 +05:30
Nabin Hait
663e971557
Make next document button hide/unhide
2012-04-24 11:39:54 +05:30
Nabin Hait
40738aecfa
removed msgprint
2012-04-19 13:55:45 +05:30
Anand Doshi
24e18569d9
fixes in install docs for roles
2012-04-17 11:45:35 +05:30
Nabin Hait
7fca9e617d
fixes in global defaults
2012-04-13 12:18:06 +05:30
Nabin Hait
b176e94b92
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-13 11:53:35 +05:30
Nabin Hait
e77164955b
removed repair fn, fixes in reports
2012-04-13 11:53:06 +05:30
Anand Doshi
7aafb7e19e
Purchase Requisition to Purchase Request
2012-04-13 11:52:17 +05:30
Rushabh Mehta
97ae17eaf7
merge
2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76
listing, module pages in appframe
2012-04-13 11:41:43 +05:30
Nabin Hait
a73b2965aa
cleanup and fixes
2012-04-13 11:02:26 +05:30
Nabin Hait
3cb148e53b
fixed conflict
2012-04-12 16:44:23 +05:30
Nabin Hait
de237e2bf7
error fixed
2012-04-12 16:36:01 +05:30
Anand Doshi
25bc68c7b2
fix in field names
2012-04-12 14:08:43 +05:30
Nabin Hait
c594bbcae0
address html issue fixed
2012-04-11 17:14:45 +05:30
Anand Doshi
2424387651
fixes after sync testing
2012-04-10 19:14:37 +05:30
Anand Doshi
87a2c5cc69
Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
...
Conflicts:
erpnext/accounts/doctype/c_form/c_form.txt
erpnext/patches/patch_list.py
erpnext/setup/doctype/permission_control/permission_control.py
2012-04-09 12:14:53 +05:30
Anand Doshi
85eb840ab4
fix in rename dt patch
2012-04-09 12:02:15 +05:30
Anand Doshi
82042f1cff
fixes after sync
2012-04-06 17:54:17 +05:30
Anand Doshi
fa0cd89a7c
change from labels to fieldname in cur_frm.cscript
2012-04-05 13:03:35 +05:30
Nabin Hait
1b81badd58
validation changes for po item
2012-04-03 11:27:03 +05:30
Anand Doshi
5112b5b6b8
rerun of rename_dt
2012-04-02 19:12:29 +05:30
Rushabh Mehta
c7f1e5a54a
patch fixes
2012-04-02 14:24:35 +05:30
Anand Doshi
c88ae2be4d
rename dt second cut
2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a
rename dt first cut
2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
...
Conflicts:
version.num
2012-03-29 15:35:08 +05:30
Anand Doshi
66722dfe69
some buying listviews
2012-03-29 15:20:35 +05:30
Anand Doshi
18ffd2a1b8
Merge branch 'master' into handlerupdate
2012-03-28 17:56:33 +05:30
Anand Doshi
a30fbd004e
merge of sync handler and sync_file_db - first cut
2012-03-27 19:31:38 +05:30
Anand Doshi
3107096890
Merge branch 'master' of github.com:webnotes/erpnext into shf_merge
2012-03-27 15:02:38 +05:30
Nabin Hait
b66ade11e0
modified item code get_query in purchase cycle
2012-03-26 15:30:11 +05:30
Nabin Hait
eecea8ef19
modified item code get_query in purchase cycle
2012-03-26 13:11:15 +05:30
Nabin Hait
9329b5a461
modified item code get_query in purchase cycle
2012-03-26 11:52:16 +05:30
Nabin Hait
ea36202fbf
modified item code get_query in purchase cycle
2012-03-26 11:33:03 +05:30
Nabin Hait
2bd086f1c3
modified item code get_query in purchase cycle
2012-03-26 11:25:31 +05:30
Nabin Hait
68764ce775
modified item code get_query in purchase cycle
2012-03-26 11:16:41 +05:30
Rushabh Mehta
9d0ea6a5f1
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 07:25:22 +02:00
Nabin Hait
f23d18316a
modified item code get_query in purchase cycle
2012-03-26 10:53:45 +05:30
Rushabh Mehta
3f46696db2
removed slider ui
2012-03-22 11:37:08 +05:30
Rushabh Mehta
9b1afe197d
cleanup of form, rename, route, added fonts
2012-03-20 14:37:44 +05:30
Rushabh Mehta
09595eee3e
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-12 13:21:07 +05:30
Rushabh Mehta
519f70b384
new autosuggest, other fixes
2012-03-09 16:44:21 +05:30
Nabin Hait
6715172211
sub contracted item are allowed to create po
2012-03-09 16:04:19 +05:30
Rushabh Mehta
f81a64e57f
new listing and changed wn.widgets.listing to wn.ui.listing
2012-03-07 18:19:41 +05:30
Rushabh Mehta
15da133de9
removed
2012-03-06 18:41:11 +05:30
Nabin Hait
cf9c4c45a5
export /import fld hide issue, discount issue
2012-03-05 15:21:35 +05:30
Nabin Hait
9cee59cd05
field order changed
2012-03-05 10:54:54 +05:30
Nabin Hait
0d155a9135
print hide issue
2012-03-02 14:57:44 +05:30
Nabin Hait
88986ca007
column break print hide issue
2012-03-02 12:29:08 +05:30
Anand Doshi
e306a1f5e1
fix in sales and purchase common column hide
2012-03-01 19:25:33 +05:30
Nabin Hait
eaf144a545
form cleanup in pur cycle
2012-03-01 13:05:04 +05:30
Nabin Hait
6c75cce4b9
fixed confilct
2012-02-28 11:46:43 +05:30
Nabin Hait
5bdd20c46b
dynamic label change, form cleanup, hide/unhide in purchase cycle
2012-02-27 18:46:51 +05:30
Rushabh Mehta
3966f1dc5d
added license files
2012-02-23 12:35:32 +05:30
Rushabh Mehta
c5471ddb8d
added setup and removed multi-col layout in body
2012-02-22 12:07:42 +05:30
Rushabh Mehta
35fabf76a6
updated module pages
2012-02-21 19:03:50 +05:30
Rushabh Mehta
085617ed12
merge latest
2012-02-21 17:31:04 +05:30
Rushabh Mehta
d025133b39
added module pages and other css updates
2012-02-21 17:26:50 +05:30
Nabin Hait
e1f976ce05
deleted supp quotation
2012-02-21 14:33:45 +05:30
Nabin Hait
2d8ac7f3f9
fixed asynchronus issue
2012-02-15 17:31:23 +05:30
Nabin Hait
3d794a682d
required by date should be mapped in indent-po
2012-02-14 15:25:11 +05:30
Nabin Hait
5bd88d99b5
fixes
2012-02-14 11:39:42 +05:30
Anand Doshi
df3f452a14
Fix in Purchase Invoice creation due to item tax stringify issue
2012-02-08 16:22:59 +05:30
Anand Doshi
d7ac84f430
removed msgprint in pending po items to receive report
2012-02-08 10:18:30 +05:30
Anand Doshi
d008964fd6
Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues
2012-02-07 10:48:11 +05:30
Anand Doshi
d3db70bb72
Supplier rename fix
2012-01-30 11:08:47 +05:30
Anand Doshi
a2fcca578d
Purchase Other Charges - company field
2012-01-24 13:46:46 +05:30
Anand Doshi
9896452903
txt dump of DocType Label Indent and Module Def Buying
2012-01-10 17:58:07 +05:30
Anand Doshi
3a82dfd171
Rename Indent to Purchase Requisition
2012-01-10 16:56:11 +05:30
Anand Doshi
a0aa3d5605
Merge branch 'master' of github.com:webnotes/erpnext
2012-01-10 13:59:04 +05:30
Anand Doshi
f80f20f480
Changes in Notifications
2012-01-04 19:31:32 +05:30
Nabin Hait
c184dc56a4
Error fixed in uom conversion rate fetching
2011-12-30 13:29:45 +05:30
Nabin Hait
e80496cef4
Consider description also to check item duplication in purchase cycle
2011-12-23 11:25:37 +05:30
Nabin Hait
b9e8a41cd2
Account and cost center get_query changes for other charges table
2011-12-21 17:33:57 +05:30
Nabin Hait
b93ea233ff
Error fixed in task
2011-12-14 18:09:13 +05:30
Nabin Hait
9e4d5b9649
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-14 11:27:50 +05:30
Nabin Hait
f21ceb283c
Arranged field order in item table
2011-12-14 11:26:05 +05:30
Nabin Hait
dcac0e7565
Merge pull request #156 from anandpdoshi/master
...
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
2011-12-13 05:37:41 -08:00
Nijil Y
8fb260504a
purchase discount
2011-12-13 18:14:15 +05:30
Anand Doshi
206df20f36
Changes in print formats to include selected print heading and discount
...
appended in description
2011-12-13 15:57:09 +05:30
Nijil Y
38821f6104
txt order update
2011-12-08 18:32:58 +05:30
Nijil Y
edf8bc2a3e
Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
...
Conflicts:
erpnext/accounts/doctype/pv_detail/pv_detail.txt
erpnext/buying/doctype/po_detail/po_detail.txt
erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
2011-12-08 17:29:24 +05:30
Nijil Y
add0c85648
Discount in purchase cycle
2011-12-08 16:53:12 +05:30
Nijil Y
d8e5bed9e5
Discount in purchase cycle
2011-12-08 16:09:18 +05:30
Nijil Y
4499851ceb
checking..
2011-12-08 14:14:11 +05:30
Nijil
c37dad26d9
txt files
2011-11-24 15:07:54 +05:30
Nijil
54eb735a47
Added Discount in Purchase Cycle
2011-11-22 15:12:00 +05:30
Nijil
4491f01ce4
discount rate on purchase
2011-11-21 11:31:27 +05:30
Nijil
eb8233c779
Merge branch 'master' of git://github.com/webnotes/erpnext
2011-11-21 10:35:15 +05:30
Nijil
c7d64cf5a8
almost
2011-11-20 00:22:41 +05:30
Nijil
296c17b7ae
checking
2011-11-18 14:12:06 +05:30
Anand Doshi
19a2767b77
Changes in spartan print formats to show border in chrome
2011-11-16 14:49:37 +05:30
Anand Doshi
e3559853bd
Added new Print Formats as part of repository
2011-11-16 13:18:45 +05:30
Nabin Hait
57dd62d790
project column moved to item table in pur cycle
2011-10-20 19:19:07 +05:30
Nabin Hait
c7cf94ec7b
page break allow_on_submit
2011-10-12 13:16:11 +05:30
Nabin Hait
914491f630
deleted duplicate button from QA inspection report
2011-10-06 10:23:26 +05:30
Nabin Hait
5630049d2a
QA Inspection: get_query
2011-10-05 16:57:36 +05:30
Rushabh Mehta
53ba83158c
fixes to startup
2011-09-15 15:06:23 +05:30
Rushabh Mehta
1e11cb486d
merging from master and usability fixes to setup
2011-09-14 13:25:10 +05:30
Rushabh Mehta
66ac2b018a
first cut for lazy loading framework
2011-09-05 18:43:09 +05:30