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 |
|
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
|
caa4380d49
|
Merge with 3.3.8
|
2013-12-26 11:07:58 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Rushabh Mehta
|
df200f305b
|
Redesigned templates. Now all templates must be inside templates/pages templates/generators
|
2013-12-25 15:19:22 +05:30 |
|
Rushabh Mehta
|
2b08985e16
|
Translations redesigned webnotes/wnframework#351
|
2013-12-19 18:27:48 +05:30 |
|
Rushabh Mehta
|
c652a6254f
|
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
|
2013-12-16 12:48:38 +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
|
d2dd83c3a3
|
fixed template loader webnotes/wnframework#351
|
2013-12-12 13:57:58 +05:30 |
|
Rushabh Mehta
|
39bb8e2ed4
|
step 0: install
|
2013-12-11 15:32:14 +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 |
|
Rushabh Mehta
|
f200c5296d
|
added sales analytics
|
2012-09-21 15:19:40 +05:30 |
|
Rushabh Mehta
|
6ca8054d55
|
added stock analytics
|
2012-09-20 19:03:14 +05:30 |
|
Anand Doshi
|
c63f0518d7
|
removed zoom from grid report
|
2012-09-20 12:08:47 +05:30 |
|
Anand Doshi
|
09d686f7f6
|
zoom for stock ledger report
|
2012-09-19 19:06:38 +05:30 |
|
Rushabh Mehta
|
40a3b46d61
|
Added code for plot zoom
|
2012-09-19 17:13:10 +05:30 |
|
Rushabh Mehta
|
b803cbab3d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-19 16:48:30 +05:30 |
|
Rushabh Mehta
|
5b5bc97c50
|
separated tooltip text in plot
|
2012-09-19 16:47:43 +05:30 |
|
Rushabh Mehta
|
4573515899
|
added graphs in stock ledger and general ledger
|
2012-09-19 16:41:19 +05:30 |
|
Anand Doshi
|
bb6d06f64a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-19 12:18:18 +05:30 |
|
Anand Doshi
|
cdd5cfefd5
|
make item code read-only after saving
|
2012-09-19 12:17:41 +05:30 |
|
Rushabh Mehta
|
823c021e9c
|
added index patch and updated general_ledger
|
2012-09-19 12:01:01 +05:30 |
|
Rushabh Mehta
|
eb8673ecc6
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-18 18:52:38 +05:30 |
|
Rushabh Mehta
|
2ad0d424a9
|
Stock Ledger Report
|
2012-09-18 18:52:05 +05:30 |
|
Nabin Hait
|
9a90c89b3f
|
removed duplicate function from sales invoice
|
2012-09-18 13:37:27 +05:30 |
|
Anand Doshi
|
6450b12881
|
fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form
|
2012-09-17 11:34:24 +05:30 |
|
Rushabh Mehta
|
b40e93733c
|
merge with master
|
2012-09-14 11:29:52 +05:30 |
|
Nabin Hait
|
ebc3b6a68d
|
stock ledger added
|
2012-09-14 11:25:57 +05:30 |
|
Rushabh Mehta
|
c6369046a1
|
merge
|
2012-09-14 11:09:46 +05:30 |
|