Nabin Hait
|
faf176d78c
|
Overwrite from POS Settings if value exists
|
2014-06-18 19:52:24 +05:30 |
|
Nabin Hait
|
4d7c4fc0f4
|
Get party details fixes
|
2014-06-18 16:40:59 +05:30 |
|
Nabin Hait
|
e7c2f74a07
|
Stocvk entry incoming rate for sales return
|
2014-06-18 16:40:59 +05:30 |
|
Nabin Hait
|
a7da6e1480
|
Incoming rate for sales return
|
2014-06-18 16:40:59 +05:30 |
|
Nabin Hait
|
ae0d753cad
|
Valuation rate and amount for fg item
|
2014-06-18 16:40:59 +05:30 |
|
Anand Doshi
|
de12a0941f
|
Stock Entry: get fg item incoming rate if bom is mentioned
|
2014-06-18 14:05:29 +05:30 |
|
Anand Doshi
|
987a28fc6a
|
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
This reverts commit 297939325a .
|
2014-06-18 14:05:08 +05:30 |
|
Anand Doshi
|
297939325a
|
Stock Entry: get fg item incoming rate if bom is mentioned
|
2014-06-18 13:10:10 +05:30 |
|
Anand Doshi
|
2f800521cb
|
Don't set default for warehouse when creating serial no
|
2014-06-18 12:48:46 +05:30 |
|
Nabin Hait
|
0693937c1e
|
Fixes in fetching valuation rate in stock entry
|
2014-06-18 10:20:01 +05:30 |
|
Nabin Hait
|
b73d3f925d
|
Do not make packing list after submission
|
2014-06-18 10:18:50 +05:30 |
|
Rushabh Mehta
|
36881807ed
|
Merge branch 'wip-4.2' into wip-4.1
|
2014-06-17 17:36:22 +05:30 |
|
Rushabh Mehta
|
9f887b436c
|
fixes new routing, for frappe/frappe#600
|
2014-06-17 16:53:44 +05:30 |
|
Rushabh Mehta
|
5df521bad5
|
updated generators for wip-4.2
|
2014-06-17 14:21:26 +05:30 |
|
Nabin Hait
|
d2e8a0a96a
|
Delivery note update after submission
|
2014-06-17 12:55:52 +05:30 |
|
Nabin Hait
|
a6fc3f6337
|
Ignore pricing rule for material request
|
2014-06-16 15:34:52 +05:30 |
|
Nabin Hait
|
539f352318
|
Delivery note to packing slip mapping
|
2014-06-16 15:03:36 +05:30 |
|
Anand Doshi
|
c1bfb63d96
|
Create price list if missing
|
2014-06-13 12:41:08 +05:30 |
|
Nabin Hait
|
f2202fc014
|
minor fix
|
2014-06-12 15:20:47 +05:30 |
|
Nabin Hait
|
46dc3b1442
|
validations added in stock entry
|
2014-06-12 12:48:28 +05:30 |
|
Nabin Hait
|
2128c98c35
|
available qty validation. Fixes #1045
|
2014-06-12 12:42:22 +05:30 |
|
Nabin Hait
|
e98b326ba3
|
Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932
|
2014-06-12 12:25:23 +05:30 |
|
Anand Doshi
|
7656377f3f
|
Show website route for generator via set_intro, fix in Support Email Settings
|
2014-06-10 15:48:37 +05:30 |
|
Anand Doshi
|
b527e54809
|
Fixed report: Item wise Price List Rate
|
2014-06-09 18:08:46 +05:30 |
|
Anand Doshi
|
edb9efd9a6
|
Fixed manifest and website
|
2014-06-09 15:11:18 +05:30 |
|
Anand Doshi
|
cdfa9a371d
|
Export perm for GL Entry and Stock Ledger Entry
|
2014-06-09 15:11:17 +05:30 |
|
Anand Doshi
|
482d29dc53
|
Fixed Purchase Receipt qty trigger
|
2014-06-06 20:34:08 +05:30 |
|
Rushabh Mehta
|
880b3ef6c0
|
added qty updating option multi-item selector
|
2014-06-06 11:45:30 +05:30 |
|
Rushabh Mehta
|
ba83e9cfbe
|
removed sms control and related cleanup, fixes frappe/erpnext#462
|
2014-06-05 17:56:42 +05:30 |
|
Nabin Hait
|
19d1e499c3
|
Removed Purchase in transit report #1435
|
2014-06-04 19:00:56 +05:30 |
|
Anand Doshi
|
ec8240e890
|
Apply User Permissions optional in Script and Query Reports
|
2014-06-04 17:48:58 +05:30 |
|
Anand Doshi
|
69eec9e344
|
Role and User Permissions
|
2014-06-04 17:48:54 +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
|
ce6977ffe6
|
Minor fixes in fetching item details
|
2014-06-03 23:02:02 +05:30 |
|
Nabin Hait
|
bc7efa6da6
|
Parent account mandatory for all non-root accounts
|
2014-06-03 23:02:02 +05:30 |
|
Nabin Hait
|
b15764ef2c
|
Translation issue fixed in analytics/grid report
|
2014-06-03 13:02:39 +05:30 |
|
Nabin Hait
|
548cf96c44
|
Minor fixes in sales return
|
2014-05-30 19:09:59 +05:30 |
|
Nabin Hait
|
e6ddd28067
|
Don't execute reorder_item, if initial setup not completed. fixes #1668
|
2014-05-30 15:53:20 +05:30 |
|
Nabin Hait
|
c1367d9d10
|
minor fixes
|
2014-05-30 11:43:00 +05:30 |
|
Nabin Hait
|
7f32cbeb06
|
Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials #1688
|
2014-05-30 11:22:15 +05:30 |
|
Nabin Hait
|
c7253b3a37
|
Get valuation rate for fg item base don issued item cost + operation cost. #1688
|
2014-05-30 11:22:15 +05:30 |
|
Nabin Hait
|
66cecf4824
|
uom trigger issue in stock entry fixes #1712
|
2014-05-30 11:22:15 +05:30 |
|
Nabin Hait
|
f3552ca737
|
packing slip fixes #1711
|
2014-05-30 11:22:15 +05:30 |
|
Nabin Hait
|
3dc6a80198
|
deleted delivery note packing list wise print format
|
2014-05-30 11:22:14 +05:30 |
|
Nabin Hait
|
e71159d6ea
|
Standard Rate field removed from item. Fixes #1688
|
2014-05-30 11:22:14 +05:30 |
|
Nabin Hait
|
732a7e81a0
|
Incoming rate in stock ledger and valuation rate in stock balance report. Fixes #1706
|
2014-05-30 11:22:14 +05:30 |
|
Nabin Hait
|
9bc9b8795b
|
Fixes in stock reconciliation
|
2014-05-30 11:22:13 +05:30 |
|
Nabin Hait
|
d0605443fb
|
removed print statement
|
2014-05-30 11:22:13 +05:30 |
|
Nabin Hait
|
47a8670d37
|
pricing rule testcase fixes
|
2014-05-30 11:22:12 +05:30 |
|
Nabin Hait
|
ccb9826afd
|
pricing list tets case fixes
|
2014-05-30 11:22:12 +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 |
|
Rushabh Mehta
|
a7c46e4d83
|
removed debug in query (packing_slip.py)
|
2014-05-26 13:35:47 +05:30 |
|
Rushabh Mehta
|
b15d760406
|
fix to packing slip (validation)
|
2014-05-26 13:05:19 +05:30 |
|
Nabin Hait
|
edf87a258f
|
Create serial no based on series only if item is serialized
|
2014-05-21 15:38:56 +05:30 |
|
Nabin Hait
|
2e0620e370
|
Server side onload functionality in multiple docs
|
2014-05-19 18:15:58 +05:30 |
|
Nabin Hait
|
b5a8cab8df
|
Valuation Rate column in Stock Ledger report. Fixed #1633
|
2014-05-15 11:50:46 +05:30 |
|
Anand Doshi
|
54b7962eb9
|
Pass frm to open_mapped_doc
|
2014-05-14 17:38:45 +05:30 |
|
Anand Doshi
|
39cc1df560
|
Fixes #1635, Stock Reconcilation
|
2014-05-14 15:10:00 +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 |
|
Nabin Hait
|
b3bead2f06
|
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
|
2014-05-12 17:46:02 +05:30 |
|
Nabin Hait
|
827480fd2b
|
import, export and report permission in account and pricing rule
|
2014-05-12 17:45:37 +05:30 |
|
Rushabh Mehta
|
2fdb51f85e
|
fixes frappe/erpnext#1627
|
2014-05-12 17:32:36 +05:30 |
|
Nabin Hait
|
2f50b85f99
|
Test case fixes for serial no
|
2014-05-11 13:03:53 +05:30 |
|
Nabin Hait
|
0ff6e3a6bb
|
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
|
2014-05-11 12:11:50 +05:30 |
|
Nabin Hait
|
75e50ee082
|
Fixes for subcontracting
|
2014-05-11 12:11:15 +05:30 |
|
Nabin Hait
|
6d5c248402
|
Test case fixes for serial no
|
2014-05-11 12:10:57 +05:30 |
|
Anand Doshi
|
78e9c6ef70
|
Deprecate Select fields with options as link:
|
2014-05-09 13:36:13 +05:30 |
|
Nabin Hait
|
d64a952b5d
|
Stock reco: item and warehouse validation and translation fixes
|
2014-05-09 11:50:24 +05:30 |
|
Nabin Hait
|
344f4436f1
|
Create / update raw materials supplied table for sub-contracting
|
2014-05-08 19:08:20 +05:30 |
|
Nabin Hait
|
5d070753fd
|
Item managed batch-wise, can not be reconciled through stock reconciliation
|
2014-05-08 19:08:06 +05:30 |
|
Nabin Hait
|
227db769a0
|
Item valuation rate on material transfer based on fifo
|
2014-05-08 19:06:01 +05:30 |
|
Anand Doshi
|
0c85169539
|
Fixed clear cache for item page
|
2014-05-08 17:46:00 +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
|
37909b292f
|
Remove India specific fields
|
2014-05-06 16:15:56 +05:30 |
|
Nabin Hait
|
cea4cd4e5f
|
Pull stock entry difference account from company
|
2014-05-06 11:57:33 +05:30 |
|
Nabin Hait
|
98c2a052e5
|
Fixes in pricing rule testcases #565
|
2014-05-05 18:41:41 +05:30 |
|
Nabin Hait
|
f2db87a766
|
Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565
|
2014-05-05 15:04:55 +05:30 |
|
Nabin Hait
|
53dab55703
|
Pricing Rule: if multiple rules, ask to resolve conflict #565
|
2014-05-05 14:49:40 +05:30 |
|
Nabin Hait
|
f57f0a661a
|
Stock Entry: pulling items from BOM fixed #1579
|
2014-05-05 10:27:53 +05:30 |
|
Anand Doshi
|
4ab5382d3f
|
Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564
|
2014-05-04 11:50:10 +05:30 |
|
Nabin Hait
|
296d626e53
|
Back flush issue fixed in sub contracting #1567
|
2014-05-02 17:36:13 +05:30 |
|
Nabin Hait
|
1e6c32e95f
|
Address and contact creation from opportunity #1570
|
2014-05-02 11:42:24 +05:30 |
|
Nabin Hait
|
d341254786
|
Purchase receipt to purchase invoice item
|
2014-05-01 17:42:21 +05:30 |
|
Anand Doshi
|
d9f0f27cd4
|
Fixes in test cases
|
2014-04-30 22:16:25 +05:30 |
|
Rushabh Mehta
|
a15164750d
|
started client side testing using selenium and other related and unrelated fixes
|
2014-04-30 19:39:13 +05:30 |
|
Nabin Hait
|
6777efa7fa
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-04-28 17:09:13 +05:30 |
|
Nabin Hait
|
2594e41462
|
Removed Stock Ledger doctype
|
2014-04-28 16:23:45 +05:30 |
|
Anand Doshi
|
6916baa299
|
BugFix: Item search in Stock UOM Replace Utility
|
2014-04-28 15:33:34 +05:30 |
|
Rushabh Mehta
|
41d126586e
|
fix get_server_fields in stock_entry.js
|
2014-04-27 12:30:20 +05:30 |
|
Anand Doshi
|
8e5b2af0fb
|
Set conversion_factor in stock entry test case
|
2014-04-25 19:35:06 +05:30 |
|
Anand Doshi
|
fc79efb97c
|
Fixes #1532. Only show an error message for missing Quality Inspection but let the user submit Purchase Receipt.
|
2014-04-25 18:44:28 +05:30 |
|
Anand Doshi
|
bbffaf78fb
|
BugFix: use transfer_qty instead of actual_qty in check_duplicate_entry_for_production_order - ported webnotes/erpnext@942ff2583b
|
2014-04-25 18:31:09 +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
|
68d0b7c7ff
|
get_item_details fixed for Material Request
|
2014-04-22 19:30:53 +05:30 |
|
Anand Doshi
|
07339fc69e
|
Fixes in Setup Wizard and Attachments
|
2014-04-22 15:30:24 +05:30 |
|
Anand Doshi
|
0549b1c5c9
|
Duplicate supplier delivery number validation in Purchase Receipt should happen per financial year
|
2014-04-21 15:59:47 +05:30 |
|
Anand Doshi
|
21ae930b4c
|
Removed controller.py
|
2014-04-21 15:12:50 +05:30 |
|
Anand Doshi
|
424c033395
|
Removed controller.py
|
2014-04-21 15:06:56 +05:30 |
|
Anand Doshi
|
5d591ebe83
|
Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext
|
2014-04-18 16:20:07 +05:30 |
|
Rushabh Mehta
|
169c1fd93b
|
fixed translation for setup-wizard and removed purchase validation for Material Request #925
|
2014-04-18 10:40:17 +05:30 |
|
Anand Doshi
|
ac32bad25a
|
Fixes in Taxes, Quotation and Address Territory
|
2014-04-18 01:32:02 +05:30 |
|
Anand Doshi
|
dbfcd328fb
|
Fixes update_after_submit validation errors
|
2014-04-17 12:35:04 +05:30 |
|
Anand Doshi
|
0d345c9152
|
Fixes Item Price duplicate entry validation
|
2014-04-17 11:40:22 +05:30 |
|
Anand Doshi
|
094610d7ce
|
Fixes in Production, Stock Entry and Stock Controller
|
2014-04-16 20:23:24 +05:30 |
|
Rushabh Mehta
|
052fe82688
|
production order: test fixed and added in test_stock_entry.py
|
2014-04-16 19:20:11 +05:30 |
|
Rushabh Mehta
|
c38fc713c6
|
updated translations
|
2014-04-16 17:46:30 +05:30 |
|
Anand Doshi
|
652bc0784a
|
Ported v3 fixes to v4
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
|
2014-04-16 15:26:42 +05:30 |
|
Nabin Hait
|
6298536e46
|
set stock balance as per serial no count
Cherry Picked and Modified by @anandpdoshi
Conflicts:
stock/doctype/stock_ledger/stock_ledger.py
utilities/repost_stock.py
|
2014-04-16 15:23:08 +05:30 |
|
Rushabh Mehta
|
d85dc868ca
|
more message fixes for translation
|
2014-04-15 22:54:34 +05:30 |
|
Rushabh Mehta
|
ff93802d58
|
more message fixes
|
2014-04-15 18:40:31 +05:30 |
|
Rushabh Mehta
|
2c45899a02
|
fixed strings for translation
|
2014-04-15 14:41:56 +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 |
|
Pratik Vyas
|
e1eeb22f1e
|
remove linebreaks for translation strings (js)
|
2014-04-15 10:50:36 +05:30 |
|
Rushabh Mehta
|
9f0d625300
|
update translation strings #1403
|
2014-04-14 19:20:45 +05:30 |
|
Pratik Vyas
|
b0f279a34e
|
js translations refactor
|
2014-04-14 17:14:23 +05:30 |
|
Pratik Vyas
|
b52618c142
|
frappe._ to __
|
2014-04-14 16:25:30 +05:30 |
|
Anand Doshi
|
bd67e87921
|
Fixes saving of Sales Order and fetching Prices frappe/frappe#478
|
2014-04-11 16:51:27 +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 |
|
Anand Doshi
|
2ce39cf770
|
Fixed Stock Entry Test Cases frappe/frappe#478
|
2014-04-07 18:51:58 +05:30 |
|
Nabin Hait
|
103cc58cb6
|
material request testcase #478
|
2014-04-07 16:40:43 +05:30 |
|
Nabin Hait
|
088dec6c09
|
testcase fixes #478
|
2014-04-07 16:00:28 +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 |
|
Rushabh Mehta
|
a504f0638b
|
frappe/frappe#478, fixed list passed in
|
2014-04-04 12:16:26 +05:30 |
|
Rushabh Mehta
|
558a9aabfb
|
removed control panel
|
2014-04-04 12:00:36 +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
|
99f914b782
|
frappe/frappe#478, fixes
|
2014-04-03 14:47:03 +05:30 |
|
Rushabh Mehta
|
2fbb00fd8d
|
frappe/frappe#478, more changes, removed bean
|
2014-04-03 14:38:22 +05:30 |
|
Rushabh Mehta
|
f14b809ab5
|
frappe/frappe#478, more changes, removed bean
|
2014-04-03 14:30:42 +05:30 |
|
Rushabh Mehta
|
d36cb5c812
|
frappe/frappe#478 removed more instances of doclist
|
2014-04-03 12:38:42 +05:30 |
|
Rushabh Mehta
|
cfb6ccfe51
|
frappe/frappe#478 removed self.doclist
|
2014-04-03 11:46:52 +05:30 |
|
Rushabh Mehta
|
f191f854cd
|
frappe/frappe#478 erpnext install works
|
2014-04-02 18:09:34 +05:30 |
|
Anand Doshi
|
943e614810
|
frappe/frappe#478
|
2014-04-02 16:37:35 +05:30 |
|
Anand Doshi
|
5b552b51f1
|
frappe/frappe#478
|
2014-04-02 15:03:35 +05:30 |
|
Anand Doshi
|
dd32d6eb1f
|
frappe/frappe#478
|
2014-04-01 12:22:14 +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
|
1d630ccaa5
|
Update serial no maintenance status based on warranty/amc expiry date
|
2014-03-26 10:23:14 +05:30 |
|
Nabin Hait
|
425bfc5c8d
|
minor fix in serial no
|
2014-03-21 18:15:26 +05:30 |
|
Nabin Hait
|
0c21e2afef
|
Is_pl_account and debit_or_credit field removed and added report_type field in account
|
2014-03-21 11:35:59 +05:30 |
|
Nabin Hait
|
439dceebd8
|
minor fix in landed cost wizard
|
2014-03-21 11:25:17 +05:30 |
|
Nabin Hait
|
d8dcdfbf4f
|
Warehouse disable option
|
2014-03-21 11:25:17 +05:30 |
|
Nabin Hait
|
eb1192771f
|
set root type from parent or child
|
2014-03-21 11:25:17 +05:30 |
|
Nabin Hait
|
a18bf07920
|
updated charts json with proper account and root types
|
2014-03-21 11:22:41 +05:30 |
|
Nabin Hait
|
49a6f0754e
|
Removed debit_or_credit field
|
2014-03-21 11:22:38 +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 |
|
Rushabh Mehta
|
7c932003ed
|
rename Profile to User frappe/frappe#470
|
2014-03-11 16:15:59 +05:30 |
|
Anand Doshi
|
09a9f4c0c9
|
Added module to Report doctype
|
2014-03-07 17:20:22 +05:30 |
|
Rushabh Mehta
|
4541875c81
|
removed searchfield condition from get_match_cond frappe/erpnext#1457
|
2014-03-06 11:19:46 +05:30 |
|
Nabin Hait
|
9472247b6e
|
Update stock_entry.js
|
2014-03-05 17:45:58 +05:30 |
|
Anand Doshi
|
74d0e40bdc
|
Moved Notification Count hooks to frappe, employee user id patch, Item ignore restriction fields
|
2014-03-05 15:24:29 +05:30 |
|
Anand Doshi
|
f5794f1c07
|
Module Home Pages using Module View
|
2014-03-03 15:06:34 +05:30 |
|
Nabin Hait
|
177b86a15b
|
fix in pricing rule
|
2014-02-28 15:47:22 +05:30 |
|
Nabin Hait
|
13b93ebed8
|
pricing rule: fixes in testcase
|
2014-02-28 15:04:05 +05:30 |
|
Nabin Hait
|
3319170805
|
pricing rule: condition for tree-type docs
|
2014-02-28 13:04:19 +05:30 |
|
Nabin Hait
|
ed5f423e65
|
pricing rule: condition for tree-type docs
|
2014-02-28 13:04:19 +05:30 |
|
Nabin Hait
|
311079a311
|
Patch: copy customer discount to pricing rule
|
2014-02-28 13:04:19 +05:30 |
|
Nabin Hait
|
08222150f2
|
Pricing Rule fixes and reference field in all item table
|
2014-02-28 13:02:00 +05:30 |
|
Nabin Hait
|
7e8e8ba714
|
pricing rule
|
2014-02-28 13:02:00 +05:30 |
|
Nabin Hait
|
c65a0c7197
|
Allowed stock entry import
|
2014-02-28 13:02:00 +05:30 |
|
Nabin Hait
|
bc34f3edae
|
shortage qty column added in stock projected qty report
|
2014-02-28 13:02:00 +05:30 |
|
Nabin Hait
|
615d342056
|
Pricing Rule: first commit
|
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 |
|
Rushabh Mehta
|
a6628eee56
|
rename sitemap to route
|
2014-02-25 11:08:37 +05:30 |
|
Rushabh Mehta
|
6fbda08583
|
fixed sitemap patch
|
2014-02-20 19:03:03 +05:30 |
|
Nabin Hait
|
cda83bba59
|
Row no fix in stock reconciliation
|
2014-02-20 15:01:51 +05:30 |
|
Nabin Hait
|
0f2310690e
|
fix in fetch item details and supplier non-mandatory to fetch
|
2014-02-20 11:27:47 +05:30 |
|
Nabin Hait
|
f5bb9ae1b1
|
default value in single doctypes
|
2014-02-19 19:02:40 +05:30 |
|
Nabin Hait
|
9d1f077922
|
get lead details in quotation
|
2014-02-19 17:43:24 +05:30 |
|
Nabin Hait
|
05b28eb161
|
minor fixes
|
2014-02-19 11:04:32 +05:30 |
|
Nabin Hait
|
36a4db69b8
|
price list on_trash function
|
2014-02-18 15:14:46 +05:30 |
|
Pratik Vyas
|
31affc0e67
|
bump modified dates for purchase receipt and purchase invoice
|
2014-02-17 11:36:10 +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
|
36028bfb56
|
minor
|
2014-02-12 19:09:28 +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
|
eba1bdbcca
|
minor fixes
|
2014-02-12 16:04: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
|
5aecc538dd
|
Letter Head field added in purchase receipt and invoice
|
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 |
|
Nabin Hait
|
c28c86dfd8
|
Validate duplicate serial nos entry
|
2014-02-12 14:54:11 +05:30 |
|
Nabin Hait
|
9beffb646d
|
Validate duplicate serial nos entry
|
2014-02-12 14:54:11 +05:30 |
|
Akhilesh Darjee
|
f2b7cd65a9
|
customer and supplier dashboard set to company currency
|
2014-02-12 11:29:08 +05:30 |
|
Anand Doshi
|
93fdc670fe
|
Fixes in Test Cases
|
2014-02-11 14:40:21 +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 |
|
Pratik Vyas
|
79499e3615
|
fix syntax error in material request, merge booboo
|
2014-02-06 15:25:17 +05:30 |
|
Rushabh Mehta
|
307fac8b78
|
hooks fixes
|
2014-02-05 17:04:49 +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 |
|
Nabin Hait
|
d7fb6dce89
|
Stock reconciliation: cost center filters
|
2014-01-31 17:05:09 +05:30 |
|
Nabin Hait
|
c3211ab394
|
Merge pull request #1368 from akhileshdarjee/default-tax
Default tax for customer and supplier
|
2014-01-31 02:40:51 -08:00 |
|
Nabin Hait
|
b5be7bab9b
|
Stock Return: fetch customer and supplier details
|
2014-01-30 18:47:12 +05:30 |
|
Nabin Hait
|
8dc2c6a16c
|
Default accounts in company should not be copied
|
2014-01-30 17:00:09 +05:30 |
|
Nabin Hait
|
ec43e4dd33
|
Merged with develop
|
2014-01-30 15:22:10 +05:30 |
|
Akhilesh Darjee
|
e0a1039756
|
merge conflict fixed
|
2014-01-30 14:44:35 +05:30 |
|
Nabin Hait
|
0ff32e73ba
|
Merged with 4.0.0-wip
|
2014-01-30 12:41:52 +05:30 |
|
Nabin Hait
|
fe8db590a1
|
Fixed conflict while merging with develop
|
2014-01-30 12:32:47 +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 |
|
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 |
|
Anand Doshi
|
3f8f4ff6cd
|
BugFix: Production Planning Tool - get_raw_materials
|
2014-01-24 21:47:01 +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 |
|
Nabin Hait
|
5ae6a61c4d
|
Fixes related to appifing shopping cart
|
2014-01-23 15:33:30 +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
|
719f2803b3
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:01:28 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
e27717261d
|
merge conflict fixed
|
2014-01-03 18:18:31 +05:30 |
|
Akhilesh Darjee
|
57738a0ff3
|
flat discount replaced to discount amount
|
2014-01-03 18:15:07 +05:30 |
|
Nabin Hait
|
06720dfb90
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-01-01 10:47:18 +05:30 |
|
Nabin Hait
|
a2e0a9b05f
|
Fliend rearrangemet in tables
|
2014-01-01 10:45:42 +05:30 |
|
Nabin Hait
|
6260b58a0a
|
Merge pull request #1253 from nabinhait/4.0.0-wip
4.0.0 wip
|
2013-12-31 21:13:45 -08:00 |
|
Anand Doshi
|
9a4a13cb73
|
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
|
2013-12-31 17:38:21 +05:30 |
|
Nabin Hait
|
139aa71666
|
Fixed conflict while merging with master
|
2013-12-31 16:09:22 +05:30 |
|
Akhilesh Darjee
|
829eda47a8
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount
|
2013-12-30 12:31:07 +05:30 |
|
Anand Doshi
|
0663ec4a9c
|
Merge fixes: removed patches, removed Warehouse User
|
2013-12-27 18:00:28 +05:30 |
|
Akhilesh Darjee
|
d203aea7c2
|
[flat discount] flat discount implemented on sales cycle
|
2013-12-27 17:49:57 +05:30 |
|