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 |
|
Rushabh Mehta
|
bf65507939
|
added watch, check progress
|
2012-09-14 11:08:53 +05:30 |
|
Anand Doshi
|
e08249f3d5
|
allow multisort with selectable sort order
|
2012-09-13 15:39:34 +05:30 |
|
Anand Doshi
|
99e5ac3452
|
multi sort for stock ledger search criteria
|
2012-09-13 15:24:19 +05:30 |
|
Anand Doshi
|
ae64c46671
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-10 15:46:52 +05:30 |
|
Anand Doshi
|
ff6754ccf4
|
fix in bin query
|
2012-09-10 15:46:38 +05:30 |
|
Anand Doshi
|
3b3a42303d
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-10 15:14:16 +05:30 |
|
Anand Doshi
|
bb2bb03bcc
|
fix in bin reorder item condition
|
2012-09-10 15:13:22 +05:30 |
|
Anand Doshi
|
1971ca9ecb
|
renamed Report to report
|
2012-09-10 11:40:06 +05:30 |
|
Anand Doshi
|
10f4ae814c
|
renamed Report name to small case name
|
2012-09-10 11:34:51 +05:30 |
|
Anand Doshi
|
0dab087be1
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
public/js/all-app.js
|
2012-09-10 11:31:18 +05:30 |
|
Nabin Hait
|
56419e0d79
|
Stock ledger report new version
|
2012-09-07 12:11:41 +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
|
0170b2b4bc
|
default purchase taxes and charges master will be automatically fetched in pur transactions
|
2012-08-17 11:00:15 +05:30 |
|
Nabin Hait
|
e343393d73
|
add/drop index if index key not exists / exists
|
2012-08-07 10:53:52 +05:30 |
|
Anand Doshi
|
a4f6529801
|
in item's update page name, if item name is null, create page name with only the name
|
2012-08-06 13:42:19 +05:30 |
|
Anand Doshi
|
1c2b192be6
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
|
2012-08-06 13:36:19 +05:30 |
|
Nabin Hait
|
337fef0859
|
call item on_update from UOM Replace Utility
|
2012-08-06 13:33:32 +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 |
|
Nabin Hait
|
fd03762445
|
call item on_update from UOM Replace Utility
|
2012-08-06 13:18:32 +05:30 |
|
Rushabh Mehta
|
49dc5da0dc
|
refactor unicode changes and merge with master with refactored email
|
2012-08-03 16:02:24 +05:30 |
|
Rushabh Mehta
|
f0018b5e05
|
added unsubscribed fields in Lead and Contact and cleaned up sendmail function
|
2012-08-02 18:03:12 +05:30 |
|
Anand Doshi
|
59d37c4bcb
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/hr/doctype/expense_claim/expense_claim.js
erpnext/patches/patch_list.py
|
2012-07-31 17:30:49 +05:30 |
|
Nabin Hait
|
f9360ce562
|
filter on actual qty in stock level report
|
2012-07-31 17:27:11 +05:30 |
|
Nabin Hait
|
d614a6ea38
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-31 14:12:41 +05:30 |
|
Nabin Hait
|
8d97290c06
|
updated bin permission
|
2012-07-31 14:12:23 +05:30 |
|
Anand Doshi
|
fd684ec247
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-31 13:58:16 +05:30 |
|
Anand Doshi
|
29c8b3b487
|
bug fix: strip serial no field before validation to check truthy value
|
2012-07-31 13:57:06 +05:30 |
|
Nabin Hait
|
76697a5c3b
|
added filter on item group and brand
|
2012-07-31 12:07:40 +05:30 |
|
Anand Doshi
|
396628e7ea
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
|
2012-07-27 14:45:24 +05:30 |
|
Nabin Hait
|
f5b3a44da1
|
SO and DN mandatory only for stock item if made mandatory in global defaults
|
2012-07-27 10:54:18 +05:30 |
|
Rushabh Mehta
|
0fa628bf86
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
public/js/report-legacy.js
|
2012-07-26 15:46:13 +02:00 |
|
Nabin Hait
|
74b30c15ea
|
Update erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
|
2012-07-25 18:14:46 +05:30 |
|
Anand Doshi
|
7118086658
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-07-23 11:28:10 +05:30 |
|
Anand Doshi
|
76ec66dd65
|
fixes for unicode
|
2012-07-20 18:11:30 +05:30 |
|
Nabin Hait
|
93e82b8742
|
error fixed in landed cost wizard
|
2012-07-20 10:40:14 +05:30 |
|
Anand Doshi
|
1703cc89b4
|
fixes for unicode
|
2012-07-19 20:31:56 +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 |
|
Anand Doshi
|
a60266d780
|
fix in doclistview group by logic
|
2012-07-18 15:43:43 +05:30 |
|
Nabin Hait
|
41c922d200
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-18 13:19:32 +05:30 |
|
Nabin Hait
|
510eda353a
|
packing list issue fixed
|
2012-07-18 13:19:01 +05:30 |
|
Anand Doshi
|
04fd09c639
|
Merge branch 'master' of github.com:webnotes/erpnext into dev
|
2012-07-17 13:33:57 +05:30 |
|
Anand Doshi
|
4612e696b0
|
mark stock entry as is_submittable
|
2012-07-17 13:33:41 +05:30 |
|
Nabin Hait
|
a25ebe3dbf
|
Conversion rate fieldtype set as float (from currency)
|
2012-07-16 16:34:28 +05:30 |
|
Rushabh Mehta
|
2eef40bf1e
|
get_field > wn.meta.get_docfield
|
2012-07-16 14:16:57 +05:30 |
|
Anand Doshi
|
c97f780940
|
Merge branch 'master' into dev
Conflicts:
erpnext/patches/patch_list.py
erpnext/startup/js/complete_setup.js
erpnext/stock/doctype/item/item.txt
public/css/all-app.css
public/js/all-app.js
public/js/all-web.js
|
2012-07-12 22:16:19 +05:30 |
|
Anand Doshi
|
51146c07c3
|
cleaner web cache code
|
2012-07-12 18:41:12 +05:30 |
|
Rushabh Mehta
|
8cbbab2e75
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-12 18:01:31 +05:30 |
|
Rushabh Mehta
|
357fb2640b
|
sales bom fixes and mandatory in table fields
|
2012-07-12 18:00:21 +05:30 |
|
Rushabh Mehta
|
4feae61b62
|
fixes to taxes and charges master and naming_series
|
2012-07-12 16:01:20 +05:30 |
|
Nabin Hait
|
70db682a9a
|
fixed conflict in setup control
|
2012-07-12 11:47:40 +05:30 |
|
Rushabh Mehta
|
b9fabf8e16
|
sales bom cleanup
|
2012-07-11 19:18:50 +05:30 |
|
Anand Doshi
|
8c7e76ba44
|
RSS for blog
Comment addition into blog page's dom
|
2012-07-11 18:40:57 +05:30 |
|
Anand Doshi
|
1522f5d76b
|
Merge branch 'master' of github.com:webnotes/erpnext into cms2
|
2012-07-11 14:27:22 +05:30 |
|
Rushabh Mehta
|
e57267f79a
|
added patch for account and cleanups to breadcrumbs and msgprint
|
2012-07-11 13:18:58 +05:30 |
|
Nabin Hait
|
cfc6bb1d6c
|
consider warehouse, serial no and batch no from packing list for sales bom item and populate packing list only for sales bom items
|
2012-07-11 13:14:52 +05:30 |
|
Nabin Hait
|
0a38e4528b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-10 10:28:21 +05:30 |
|
Nabin Hait
|
1b310c26ce
|
removed depricated commenting style
|
2012-07-10 10:27:58 +05:30 |
|
Anand Doshi
|
e47def842d
|
Improvements in product page and its listing
Login page rendered via a template
|
2012-07-09 15:56:12 +05:30 |
|
Anand Doshi
|
c6fce634cf
|
added app frame to todo list
|
2012-07-09 12:34:02 +05:30 |
|
Anand Doshi
|
95a822c701
|
Fetch Customer's Item Code in Sales Transaction
|
2012-07-09 11:09:07 +05:30 |
|
Anand Doshi
|
1731786a61
|
Merge branch 'master' of github.com:webnotes/erpnext into cms2
|
2012-07-03 15:51:11 +05:30 |
|
Nabin Hait
|
594d63ab5d
|
serial no fix
|
2012-07-03 12:24:18 +05:30 |
|
Anand Doshi
|
e9a21cbb85
|
show child table values in doclistview
|
2012-06-29 18:09:04 +05:30 |
|
Anand Doshi
|
efc055241a
|
Merge branch 'master' into dev
|
2012-06-29 12:25:02 +05:30 |
|
Anand Doshi
|
08faf5bb7f
|
added field descriptions for packing slip
|
2012-06-29 12:24:35 +05:30 |
|
Anand Doshi
|
bd025a6cdf
|
added field descriptions for packing slip
|
2012-06-29 12:23:44 +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
|
2c2a17f138
|
pull available qty in so and DN in selection of item
|
2012-06-27 15:14:58 +05:30 |
|
Anand Doshi
|
d4425cc57d
|
Merge branch 'master' into dev
Conflicts:
erpnext/support/doctype/maintenance_visit/maintenance_visit.py
|
2012-06-27 14:13:34 +05:30 |
|
Nabin Hait
|
7ce737be3d
|
Issue fixed in stock reconciliation
|
2012-06-27 11:33:05 +05:30 |
|
Nabin Hait
|
b8108c68e9
|
Issue fixed in stock reconciliation
|
2012-06-27 11:16:28 +05:30 |
|
Anand Doshi
|
10bcf5ea25
|
blog listing + started with products page and listing
|
2012-06-26 18:54:10 +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
|
a5e972dd89
|
reserved warehouse in so and delivery warehouse in dn can be different
|
2012-06-25 18:06:37 +05:30 |
|
Nabin Hait
|
72a6ec8cb3
|
SO search query in DN: currency check removed
|
2012-06-25 10:39:38 +05:30 |
|
Rushabh Mehta
|
4c56275d26
|
appframe is now heading
|
2012-06-14 11:05:09 +05:30 |
|
Nabin Hait
|
4676891cbf
|
error fixed in reorder item email notification
|
2012-06-12 15:04:38 +05:30 |
|
Nabin Hait
|
d8fd8cfe1b
|
error fixed in reorder item email notification
|
2012-06-12 14:30:57 +05:30 |
|
Nabin Hait
|
ea8ff071cb
|
error fixed in reorder item email notification
|
2012-06-12 14:23:48 +05:30 |
|
Nabin Hait
|
9b0178acae
|
error fixed in reorder item email notification
|
2012-06-12 14:16:21 +05:30 |
|
Nabin Hait
|
2e3579a4eb
|
Item Barcode implemented
|
2012-06-07 19:09:17 +05:30 |
|
Nabin Hait
|
e91d8ccc5c
|
Custom query for item in serial no
|
2012-06-04 10:47:44 +05:30 |
|
Nabin Hait
|
1835ee6c8b
|
issue fixed
|
2012-05-31 12:28:07 +05:30 |
|
Nabin Hait
|
0908b2709b
|
fixed conflict
|
2012-05-31 11:49:37 +05:30 |
|
Nabin Hait
|
5c1de3a639
|
fixed conflict
|
2012-05-31 11:47:09 +05:30 |
|
Nabin Hait
|
353bc313a6
|
Link to Sales/accounts browser fixed
|
2012-05-31 11:43:14 +05:30 |
|
Anand Doshi
|
2ac77beb50
|
fix in packing list issue
|
2012-05-29 11:29:52 +05:30 |
|
Anand Doshi
|
9327bb9585
|
fix in tag viewing in doclistview
|
2012-05-23 15:12:22 +05:30 |
|
Anand Doshi
|
cb909d518c
|
Merge branch 'shf_rename'
|
2012-05-21 18:44:19 +05:30 |
|
Anand Doshi
|
2c4cd08844
|
more listviews
|
2012-05-21 18:40:53 +05:30 |
|
Anand Doshi
|
1aae261490
|
delete button in doclistview
|
2012-05-21 14:31:03 +05:30 |
|
Anand Doshi
|
fd3b19defa
|
Merge branch 'shf_rename'
|
2012-05-18 18:08:44 +05:30 |
|
Anand Doshi
|
67a2e0123c
|
moved po number and po date to basic info section of delivery note
|
2012-05-18 18:08:28 +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
|
d643d367ca
|
Merge branch 'shf_rename'
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-05-18 11:52:31 +05:30 |
|
Anand Doshi
|
fc9145425d
|
Fixes in Print Formats - discount in description
|
2012-05-17 18:11:54 +05:30 |
|
Anand Doshi
|
1bba28a723
|
Merge branch 'shf_rename'
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-15 18:22:55 +05:30 |
|
Nabin Hait
|
f044526b92
|
json error fixed in stock entry
|
2012-05-15 15:29:47 +05:30 |
|
Nabin Hait
|
901e92d8fa
|
rejected qty issue fixed
|
2012-05-15 13:40:26 +05:30 |
|
Nabin Hait
|
ed02a85184
|
fixed issue
|
2012-05-15 12:15:19 +05:30 |
|
Rushabh Mehta
|
deeae62b18
|
merge js/css
|
2012-05-14 15:03:17 +05:30 |
|
Anand Doshi
|
4a3d3d75de
|
Merge branch 'shf_rename'
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-14 12:53:29 +05:30 |
|
Rushabh Mehta
|
0eb790a0ae
|
cleaned up imports, doc
|
2012-05-11 15:53:37 +05:30 |
|
Nabin Hait
|
956eeb1361
|
fetch defaults after mapping from prev document
|
2012-05-11 14:45:02 +05:30 |
|
Nabin Hait
|
ef85c4e556
|
posting time fixes in stock ledger entry
|
2012-05-10 17:48:34 +05:30 |
|
Nabin Hait
|
6fb498ebcd
|
changed field position of net total(import)
|
2012-05-10 14:03:39 +05:30 |
|
Anand Doshi
|
bf68e04d2f
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-10 12:40:58 +05:30 |
|
Nabin Hait
|
08f4cb7f6a
|
stock reco fix in valuation and cancellation
|
2012-05-10 12:13:47 +05:30 |
|
Anand Doshi
|
df8b4ab9b1
|
Merge branch 'cms'
|
2012-05-10 10:21:29 +05:30 |
|
Rushabh Mehta
|
078867c411
|
fixes to listview
|
2012-05-09 16:15:51 +05:30 |
|
Nabin Hait
|
68f9ad31ae
|
serialized inventory fixes : serial no for sales bom child item and rejected qty
|
2012-05-09 15:26:27 +05:30 |
|
Nabin Hait
|
6d6ca4bdb8
|
mapper fix
|
2012-05-08 11:51:35 +05:30 |
|
Nabin Hait
|
c22bd05bb5
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-07 17:35:45 +05:30 |
|
Nabin Hait
|
5375627bca
|
stock reco issue fixed
|
2012-05-07 17:35:15 +05:30 |
|
Anand Doshi
|
a00852ce19
|
fix in purchase receipt - show challan no for indian customers
|
2012-05-07 16:59:28 +05:30 |
|
Nabin Hait
|
875ccac151
|
stock reco cancellation issue fxed
|
2012-05-04 18:48:30 +05:30 |
|
Anand Doshi
|
bc1d74dbfe
|
fix in landed cost master query
|
2012-05-04 13:13:44 +05:30 |
|
Anand Doshi
|
837baee1b4
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-04 13:05:36 +05:30 |
|
Anand Doshi
|
cc1583de88
|
fix in landed cost master
|
2012-05-04 13:04:40 +05:30 |
|
Nabin Hait
|
ff81c37689
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-04 11:46:38 +05:30 |
|
Nabin Hait
|
0fb4eeb5bb
|
cancellation issue fixed in stock reco
|
2012-05-04 11:46:07 +05:30 |
|
Rushabh Mehta
|
22cd09beb3
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-04 10:02:51 +05:30 |
|
Rushabh Mehta
|
5a774db021
|
delivery, not and sales_bom
|
2012-05-04 10:02:09 +05:30 |
|
Nabin Hait
|
a67f706c92
|
options did not updated in stock entry
|
2012-05-03 18:09:15 +05:30 |
|
Nabin Hait
|
32826a8cf1
|
fixes in customerwise price list
|
2012-05-03 13:10:34 +05:30 |
|
Rushabh Mehta
|
28bb342f96
|
list view for purchase receipt
|
2012-05-03 10:41:19 +05:30 |
|
Rushabh Mehta
|
3d0c9ba22d
|
added listview for stock entry, listview templates
|
2012-05-03 10:35:51 +05:30 |
|
Rushabh Mehta
|
182569feb0
|
shipping address on top for delivery note
|
2012-05-03 10:28:23 +05:30 |
|
Rushabh Mehta
|
acd0769098
|
list in listview and sales order fix
|
2012-05-03 10:20:38 +05:30 |
|
Nabin Hait
|
00ba2ce8b4
|
fixes in sales and pur return
|
2012-05-02 16:04:42 +05:30 |
|
Nabin Hait
|
ab96d12086
|
fixes in customerwise price list
|
2012-05-02 12:19:33 +05:30 |
|
Nabin Hait
|
796505a83e
|
field arrangement in purchase and stock cycle
|
2012-05-01 16:26:16 +05:30 |
|
Nabin Hait
|
57d7c815d2
|
field arrangement in sales cycle
|
2012-05-01 12:35:12 +05:30 |
|
Nabin Hait
|
926f46f04a
|
Fixed conflict while merging with master
|
2012-05-01 11:51:08 +05:30 |
|
Nabin Hait
|
d58da50f50
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-01 11:37:45 +05:30 |
|
Nabin Hait
|
2ade43a647
|
field arrangement in sales cycle
|
2012-05-01 11:37:13 +05:30 |
|
Nabin Hait
|
228d03ec01
|
posting time fix
|
2012-04-30 16:59:39 +05:30 |
|
Rushabh Mehta
|
542acf6757
|
website, product and grid bugfix
|
2012-04-30 14:23:12 +05:30 |
|
Rushabh Mehta
|
a4be4d3390
|
website, product and grid bugfix
|
2012-04-30 14:22:02 +05:30 |
|
Nabin Hait
|
d4c5a9e2c4
|
fixes in bin
|
2012-04-30 11:50:34 +05:30 |
|
Nabin Hait
|
3e8f35c09e
|
fixes in bin
|
2012-04-30 11:47:45 +05:30 |
|
Nabin Hait
|
fc51f995c8
|
fixes in bin
|
2012-04-30 11:43:16 +05:30 |
|
Nabin Hait
|
201f8ca821
|
fixed conflict in sales bom using ours
|
2012-04-27 14:03:06 +05:30 |
|
Nabin Hait
|
b931f37735
|
fixed conflict using ours
|
2012-04-27 13:59:39 +05:30 |
|
Nabin Hait
|
0d1daa8875
|
fld order change
|
2012-04-27 13:56:58 +05:30 |
|
Nabin Hait
|
de975ff307
|
fixed filtering issue in gs
|
2012-04-27 13:53:20 +05:30 |
|
Nabin Hait
|
762056aaa8
|
sales bom amendment issue fixed
|
2012-04-27 11:06:12 +05:30 |
|
Nabin Hait
|
b9d3ade2f4
|
sales bom issue fixed
|
2012-04-27 11:04:11 +05:30 |
|
Nabin Hait
|
a6b7886175
|
resolved conflict while merging with master
|
2012-04-26 13:02:36 +05:30 |
|
Nabin Hait
|
50c799880a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-26 12:47:30 +05:30 |
|
Nabin Hait
|
5a6e641565
|
fixed batch issue
|
2012-04-26 11:11:34 +05:30 |
|
Nabin Hait
|
aa577ed82e
|
serial no fixes: sle creation through import data
|
2012-04-25 18:25:13 +05:30 |
|
Nabin Hait
|
ed7de5fee2
|
posting time format validation
|
2012-04-25 15:07:46 +05:30 |
|
Nabin Hait
|
4626b27038
|
updated sales bom document
|
2012-04-24 15:17:56 +05:30 |
|
Nabin Hait
|
d98ca01082
|
fixed wrong serial no qty validation
|
2012-04-24 14:07:04 +05:30 |
|
Nabin Hait
|
663e971557
|
Make next document button hide/unhide
|
2012-04-24 11:39:54 +05:30 |
|
Nabin Hait
|
4c9525139d
|
Error fixed in stock ledger netry batch related
|
2012-04-24 10:38:37 +05:30 |
|
Nabin Hait
|
f19bb52b2a
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-20 13:59:22 +05:30 |
|
Nabin Hait
|
f7c506d69e
|
fixed conflict while merging with master branch
|
2012-04-20 13:58:43 +05:30 |
|
Nabin Hait
|
e72ae2a19b
|
fixed conflict
|
2012-04-20 13:41:09 +05:30 |
|
Anand Doshi
|
9e0221c58e
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-20 11:22:38 +05:30 |
|
Anand Doshi
|
b8660fb51c
|
fixes in production, porjects, packing slip
|
2012-04-20 11:21:47 +05:30 |
|
Nabin Hait
|
b9984c8995
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-20 10:25:33 +05:30 |
|
Nabin Hait
|
239e79038f
|
Customer/customer group wise price list
|
2012-04-20 10:25:03 +05:30 |
|
Rushabh Mehta
|
a11bc07a7f
|
new report builder - todo: sort, save
|
2012-04-19 17:48:57 +05:30 |
|
Anand Doshi
|
b50a7a5ff9
|
Fix in rate fetching on get item details, when using inclusive rate
|
2012-04-19 12:00:49 +05:30 |
|
Nabin Hait
|
6da191de03
|
negative stock fixes
|
2012-04-18 16:18:20 +05:30 |
|
Nabin Hait
|
7afc2124a6
|
allow negative qty feature
|
2012-04-18 12:04:20 +05:30 |
|
Anand Doshi
|
24e18569d9
|
fixes in install docs for roles
|
2012-04-17 11:45:35 +05:30 |
|
Anand Doshi
|
45a4edc9c9
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
css/all-app.css
version.num
|
2012-04-17 11:19:15 +05:30 |
|
Nabin Hait
|
fe127c216c
|
fixed issue in stock
|
2012-04-16 16:01:02 +05:30 |
|
Nabin Hait
|
6f89f1eb86
|
fixes in sales cycle
|
2012-04-16 14:44:47 +05:30 |
|
Rushabh Mehta
|
cabfc65fe0
|
lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py)
|
2012-04-14 16:08:45 +05:30 |
|
Anand Doshi
|
a0f6a3eab7
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-13 15:34:27 +05:30 |
|
Nabin Hait
|
f3348c5136
|
Merge branch 'master' into shf_rename
|
2012-04-13 14:41:56 +05:30 |
|
Nabin Hait
|
781a3c9b1f
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-13 14:41:45 +05:30 |
|
Nabin Hait
|
82c53871c7
|
fixes in se js
|
2012-04-13 14:39:04 +05:30 |
|
Nabin Hait
|
1c9061eff6
|
fixed conflict using theirs
|
2012-04-13 14:24:35 +05:30 |
|
Nabin Hait
|
6c615d9527
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-13 14:14:39 +05:30 |
|
Nabin Hait
|
b09b3bc253
|
all fields visible if any other custom purpose in stock entry
|
2012-04-13 14:13:02 +05:30 |
|
Anand Doshi
|
b3ab90a01a
|
field changes in sp return tool
|
2012-04-13 12:38:34 +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 |
|
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 |
|
Anand Doshi
|
83808267d5
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-13 11:40:38 +05:30 |
|
Anand Doshi
|
1c2ac00a82
|
fixes in sales cycle
|
2012-04-13 11:38:01 +05:30 |
|
Anand Doshi
|
f31fc22ef0
|
fixes in doctype
|
2012-04-13 11:37:19 +05:30 |
|
Nabin Hait
|
a73b2965aa
|
cleanup and fixes
|
2012-04-13 11:02:26 +05:30 |
|
Anand Doshi
|
2424387651
|
fixes after sync testing
|
2012-04-10 19:14:37 +05:30 |
|
Nabin Hait
|
0a8a487230
|
Update erpnext/stock/doctype/item/item.js
|
2012-04-10 16:50:23 +05:30 |
|
Anand Doshi
|
82042f1cff
|
fixes after sync
|
2012-04-06 17:54:17 +05:30 |
|
Anand Doshi
|
7e0479bc4c
|
cleanup of search criteria
|
2012-04-05 18:27:56 +05:30 |
|
Anand Doshi
|
fa0cd89a7c
|
change from labels to fieldname in cur_frm.cscript
|
2012-04-05 13:03:35 +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 |
|
Rushabh Mehta
|
5475a3ca66
|
patch fixes
|
2012-04-02 14:06:46 +05:30 |
|
Anand Doshi
|
0442bc5d63
|
fix in patch list
|
2012-04-02 13:09:20 +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
|
7ff696fb12
|
Merge branch 'renamedt' into shf_rename
Conflicts:
erpnext/patches/patch_list.py
|
2012-03-29 15:31:17 +05:30 |
|
Anand Doshi
|
fddb782a82
|
Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt
|
2012-03-29 15:28:16 +05:30 |
|
Anand Doshi
|
0442b4e207
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-29 15:22:15 +05:30 |
|
Anand Doshi
|
66722dfe69
|
some buying listviews
|
2012-03-29 15:20:35 +05:30 |
|
Nabin Hait
|
dc8ce0190d
|
Merge branch 'master' into renamedt
|
2012-03-29 11:53:02 +05:30 |
|
Rushabh Mehta
|
635f359a71
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 15:18:28 +02:00 |
|
Rushabh Mehta
|
43d64c6116
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 15:17:59 +02:00 |
|
Anand Doshi
|
2f74d2e7bd
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-28 18:34:50 +05:30 |
|
Anand Doshi
|
779a365420
|
fix in print hide of amount in words
|
2012-03-28 18:31:26 +05:30 |
|
Anand Doshi
|
18ffd2a1b8
|
Merge branch 'master' into handlerupdate
|
2012-03-28 17:56:33 +05:30 |
|
Anand Doshi
|
c9456c18dc
|
listviews
|
2012-03-28 17:48:30 +05:30 |
|
Rushabh Mehta
|
bb769c5461
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 08:04:17 +02:00 |
|
Nabin Hait
|
13f789701e
|
erro fixed in reorder_item
|
2012-03-28 11:33:25 +05:30 |
|
Nabin Hait
|
df77a1f619
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-28 11:32:58 +05:30 |
|
Nabin Hait
|
6ed0450dba
|
reload mapper for checking ref value
|
2012-03-28 11:32:44 +05:30 |
|
Anand Doshi
|
2513e50dc4
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
Conflicts:
erpnext/website/doctype/style_settings/style_settings.txt
version.num
|
2012-03-27 19:37:10 +05:30 |
|
Anand Doshi
|
a30fbd004e
|
merge of sync handler and sync_file_db - first cut
|
2012-03-27 19:31:38 +05:30 |
|
Nabin Hait
|
a0a3ca3178
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-27 17:09:03 +05:30 |
|
Anand Doshi
|
3107096890
|
Merge branch 'master' of github.com:webnotes/erpnext into shf_merge
|
2012-03-27 15:02:38 +05:30 |
|
Anand Doshi
|
063fe503db
|
fix in queries in stock reconciliation
|
2012-03-26 22:32:34 +05:30 |
|
Anand Doshi
|
c009450ef0
|
fix in item addition - details fetching
|
2012-03-26 14:17:30 +05:30 |
|
Nabin Hait
|
e2fe5629f0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-26 11:07:01 +05:30 |
|
Rushabh Mehta
|
9d0ea6a5f1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 07:25:22 +02:00 |
|
Anand Doshi
|
964dee9f18
|
fix in stock reconciliation
|
2012-03-26 10:54:05 +05:30 |
|
Anand Doshi
|
5f9501d4d8
|
Merge branch 'sync_file_db' into shf_merge
Conflicts:
erpnext/projects/doctype/project/project.txt
|
2012-03-23 14:51:35 +05:30 |
|
Rushabh Mehta
|
aaac794a8e
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 06:08:04 +01:00 |
|
Nabin Hait
|
40d4b4d939
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-22 10:34:13 +05:30 |
|
Nabin Hait
|
2f82219fd0
|
item query changes in stock entry
|
2012-03-22 10:32:06 +05:30 |
|
Nabin Hait
|
9066dcaba5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-22 10:26:07 +05:30 |
|
Nabin Hait
|
bad13149b2
|
item query changes in stock entry
|
2012-03-22 10:24:26 +05:30 |
|
Nabin Hait
|
f676824791
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-21 17:08:35 +05:30 |
|
Rushabh Mehta
|
c1f8af58d1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 11:29:06 +01:00 |
|
Nabin Hait
|
2a68bdf231
|
Update erpnext/stock/doctype/stock_entry/stock_entry.txt
|
2012-03-21 15:50:14 +05:30 |
|
Rushabh Mehta
|
e07c38f5f5
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 11:06:38 +01:00 |
|
Nabin Hait
|
c37cb4d7c3
|
Update erpnext/stock/doctype/stock_entry/stock_entry.js
|
2012-03-21 15:35:41 +05:30 |
|
Nabin Hait
|
ac9adff1bb
|
Update erpnext/stock/doctype/stock_entry/stock_entry.py
|
2012-03-21 15:35:04 +05:30 |
|
Nabin Hait
|
7ff14ede3c
|
Update erpnext/stock/doctype/stock_entry/stock_entry.txt
|
2012-03-21 15:33:50 +05:30 |
|
Nabin Hait
|
0ad2ef2111
|
sync with respect to file
|
2012-03-21 15:02:39 +05:30 |
|
Rushabh Mehta
|
0d1e918177
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 06:33:35 +01:00 |
|
Nabin Hait
|
39a24794eb
|
Purpose others to other
|
2012-03-21 11:02:50 +05:30 |
|
Rushabh Mehta
|
454c6ac716
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 05:42:31 +01:00 |
|
Nabin Hait
|
93654a3e04
|
stock entry: new purpose others added
|
2012-03-20 14:31:14 +05:30 |
|
Rushabh Mehta
|
8d8fa66e8f
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 14:06:12 +01:00 |
|
Nabin Hait
|
b7dce7da31
|
Update erpnext/stock/doctype/delivery_note/delivery_note.js
|
2012-03-19 18:35:57 +05:30 |
|
Rushabh Mehta
|
a0a53c90f1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 06:12:43 +01:00 |
|
Nabin Hait
|
15a0271557
|
Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
|
2012-03-19 10:22:32 +05:30 |
|
Nabin Hait
|
9f5b2cd8d9
|
Update erpnext/stock/doctype/delivery_note/delivery_note.txt
|
2012-03-19 10:20:22 +05:30 |
|
Rushabh Mehta
|
2f052fd1ff
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-15 07:22:39 +01:00 |
|
Rushabh Mehta
|
08b670bddd
|
listing with stats
|
2012-03-14 19:06:20 +05:30 |
|
Rushabh Mehta
|
3b3e336fcc
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-14 13:25:19 +01:00 |
|
Anand Doshi
|
0e2461fa7c
|
fix in qa inspection report link
|
2012-03-14 17:53:53 +05:30 |
|
Rushabh Mehta
|
0dd5da2299
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-06 18:41:52 +05:30 |
|
Rushabh Mehta
|
15da133de9
|
removed
|
2012-03-06 18:41:11 +05:30 |
|
Nabin Hait
|
a528f54dcb
|
serial no fld print_hide=0
|
2012-03-05 17:45:38 +05:30 |
|
Nabin Hait
|
cf9c4c45a5
|
export /import fld hide issue, discount issue
|
2012-03-05 15:21:35 +05:30 |
|
Nabin Hait
|
07e9ff3d30
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-05 10:55:24 +05:30 |
|
Nabin Hait
|
9cee59cd05
|
field order changed
|
2012-03-05 10:54:54 +05:30 |
|
Anand Doshi
|
821cb64987
|
fix in delivery note detail double entry
|
2012-03-03 16:27:48 +05:30 |
|
Anand Doshi
|
146f17bf57
|
fix in delivery note submission - error caused due to default packed qty
|
2012-03-03 15:01:41 +05:30 |
|
Nabin Hait
|
0d155a9135
|
print hide issue
|
2012-03-02 14:57:44 +05:30 |
|
Nabin Hait
|
1841d8defa
|
pr/dn no mapping through sales/pur return
|
2012-03-02 14:57:27 +05:30 |
|
Nabin Hait
|
88986ca007
|
column break print hide issue
|
2012-03-02 12:29:08 +05:30 |
|
Nabin Hait
|
760e91e949
|
print hide issue fixed in dn
|
2012-03-01 19:23:21 +05:30 |
|
Nabin Hait
|
f237a67183
|
transaction date issue in mapper
|
2012-03-01 18:03:47 +05:30 |
|
Anand Doshi
|
496d9a0980
|
Merge branch 'master' into navupdate
|
2012-03-01 14:55:22 +05:30 |
|
Anand Doshi
|
08c8edb87f
|
fix in desktop and notifications
|
2012-03-01 14:53:05 +05:30 |
|
Nabin Hait
|
eaf144a545
|
form cleanup in pur cycle
|
2012-03-01 13:05:04 +05:30 |
|
Nabin Hait
|
e73db0e331
|
set serial_no status="In Store" if purchase return cancelled
|
2012-03-01 12:26:12 +05:30 |
|
Nabin Hait
|
bb4539e458
|
fixed conflict in version
|
2012-03-01 10:58:48 +05:30 |
|
Nabin Hait
|
6d517ff005
|
form cleanup: fixed callback issues
|
2012-03-01 10:57:23 +05:30 |
|
Rushabh Mehta
|
a4f454faa0
|
module page link fix
|
2012-02-29 19:19:01 +05:30 |
|
Anand Doshi
|
0b8ac7fc68
|
fix in company setup
|
2012-02-29 18:33:39 +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 |
|
Nabin Hait
|
5b09122264
|
fixed conflict while merging
|
2012-02-27 12:52:46 +05:30 |
|
Nabin Hait
|
0959341130
|
Form Cleanup: Dynamic label change, smart hide/unhide and dependencies
|
2012-02-27 12:47:40 +05:30 |
|
Rushabh Mehta
|
3966f1dc5d
|
added license files
|
2012-02-23 12:35:32 +05:30 |
|
Rushabh Mehta
|
17773d0763
|
added docdiff and removed un-necessary files
|
2012-02-22 15:55:41 +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 |
|
Anand Doshi
|
ff33677624
|
Packing Slip Fix
|
2012-02-21 16:26:08 +05:30 |
|
Nabin Hait
|
1a7cd16dba
|
reorder qty fld in item
|
2012-02-21 13:26:49 +05:30 |
|
Nabin Hait
|
5fe6760406
|
reorder level checking based on stores and reserved warehouse
|
2012-02-21 13:25:27 +05:30 |
|
Anand Doshi
|
e31d94ffc4
|
fix in control panel issue of sales and purchase return wizard
|
2012-02-17 10:27:46 +05:30 |
|
Nabin Hait
|
195b620787
|
callback issue in packing slip
|
2012-02-16 15:21:39 +05:30 |
|
Nabin Hait
|
2d8ac7f3f9
|
fixed asynchronus issue
|
2012-02-15 17:31:23 +05:30 |
|
Nabin Hait
|
84d73103f8
|
sales team mapping issue in SO-DN and SO-RV
|
2012-02-14 15:13:21 +05:30 |
|
Anand Doshi
|
ce0c65f173
|
Merge branch 'stable' into latest
|
2012-02-13 18:01:23 +05:30 |
|
Anand Doshi
|
82cfe4b28d
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
|
2012-02-13 15:30:24 +05:30 |
|
Anand Doshi
|
702f174265
|
call update item details in post render
|
2012-02-13 15:29:41 +05:30 |
|
Nabin Hait
|
043b0f26bd
|
Merge branch 'stable' of github.com:webnotes/erpnext
|
2012-02-13 12:26:45 +05:30 |
|
Nabin Hait
|
b0fd0b3615
|
Edited through patch
|
2012-02-13 11:34:36 +05:30 |
|
Anand Doshi
|
15d2d45b36
|
Merge branch 'stable' into latest
|
2012-02-10 10:57:26 +05:30 |
|
Anand Doshi
|
110047ea5b
|
Debit/Credit note creation on purchase/sales return
|
2012-02-10 10:48:35 +05:30 |
|
Anand Doshi
|
cf5f0232a9
|
Merge branch 'stable' into latest
|
2012-02-08 16:23:35 +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
|
4e47c48707
|
Merge branch 'stable' into latest
|
2012-02-07 13:33:10 +05:30 |
|
Anand Doshi
|
7e8082e193
|
Fixed mapping of conversion rate for PO-PR and PO-PV
|
2012-02-07 13:32:20 +05:30 |
|
Anand Doshi
|
e00e70841c
|
Merge branch 'stable' into latest
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
|
2012-02-07 10:58:45 +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
|
99e7f3d7a4
|
Fix in valuation_control.py: eval requires a string. does not accept None.
|
2012-02-06 18:06:34 +05:30 |
|
Anand Doshi
|
a9a5128402
|
Merge branch 'stable' into latest
Conflicts:
erpnext/stock/doctype/item/item.txt
index.html
version.num
|
2012-02-02 11:44:25 +05:30 |
|
Anand Doshi
|
75d30b803f
|
Packing Slip and its patches
|
2012-02-02 11:38:15 +05:30 |
|
Anand Doshi
|
4f948e03be
|
Set docstatus as 2 for a purchase returned serial no
|
2012-02-01 11:27:36 +05:30 |
|
Rushabh Mehta
|
ab1148cbc9
|
added products, custom pages and footer
|
2012-01-31 18:01:16 +05:30 |
|
Anand Doshi
|
6afc6818a3
|
Check for duplicate challan number only in submitted purchase receipts
|
2012-01-31 17:21:04 +05:30 |
|
Anand Doshi
|
0717ca63b2
|
Fix in Purchase Return - Serial No. status issue
|
2012-01-31 16:20:37 +05:30 |
|
Rushabh Mehta
|
d6840b202a
|
added products + cleanups
|
2012-01-30 14:00:46 +05:30 |
|
Anand Doshi
|
c655e37f1a
|
Fixes in production and stock modules
|
2012-01-25 09:58:06 +05:30 |
|
Anand Doshi
|
869c7bcbb2
|
Validate if another GRN exists having same supplier and challan no. - then throw exception
|
2012-01-19 18:31:21 +05:30 |
|
Anand Doshi
|
d3a23b5e8c
|
Item Manufacturer/Supplier Details in item doctype
|
2012-01-17 18:46:43 +05:30 |
|
Anand Doshi
|
2bc9423cd1
|
Fix: Backflush issue due to missing BOM
|
2012-01-12 12:32:13 +05:30 |
|
Nabin Hait
|
c5d6bcbb8f
|
Production module cleanup
|
2012-01-11 16:41:16 +05:30 |
|
Anand Doshi
|
266829f024
|
Merge branch 'master' into stable
|
2012-01-10 13:59:14 +05:30 |
|
Anand Doshi
|
a0aa3d5605
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-01-10 13:59:04 +05:30 |
|
Anand Doshi
|
a9df960494
|
On Print Hide, hide net_total, rounded_total_export and grand_total_export
|
2012-01-09 16:55:30 +05:30 |
|
Anand Doshi
|
58455c9d8e
|
Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed
|
2012-01-06 14:33:57 +05:30 |
|
Nabin Hait
|
a9cca2e2e9
|
error fixed in reorder indent
|
2012-01-05 14:10:14 +05:30 |
|
Nabin Hait
|
2abc6026f2
|
reload po-pr mapper
|
2012-01-05 11:24:49 +05:30 |
|
Anand Doshi
|
5e57a39bb1
|
Merge branch 'master' into stable
|
2012-01-04 19:32:01 +05:30 |
|
Anand Doshi
|
f80f20f480
|
Changes in Notifications
|
2012-01-04 19:31:32 +05:30 |
|
Anand Doshi
|
6ac1d4bb44
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
|
2012-01-03 11:45:11 +05:30 |
|
Nabin Hait
|
a21156d4d3
|
Removed msgprint
|
2011-12-30 11:16:15 +05:30 |
|
Nabin Hait
|
9e08c12a10
|
Default price list currency issue in delivery note fixed
|
2011-12-28 16:30:48 +05:30 |
|
Nabin Hait
|
d0a892ffe7
|
print hide price list flds
|
2011-12-22 19:04:49 +05:30 |
|
Nabin Hait
|
9e8249fea1
|
Error fixed in bin
|
2011-12-22 12:54:13 +05:30 |
|
Nijil Y
|
f800dc02f1
|
fix
|
2011-12-21 16:20:39 +05:30 |
|
Nijil Y
|
07b03fbe09
|
Merge branch 'master' of github.com:nijil/erpnext
|
2011-12-21 14:54:34 +05:30 |
|
Nijil Y
|
9e6f00abab
|
fixes for notification
|
2011-12-21 14:54:14 +05:30 |
|
Nijil Y
|
b36bebe9f0
|
Update erpnext/stock/doctype/bin/bin.py
|
2011-12-21 14:53:04 +05:30 |
|
Nijil Y
|
2c19960996
|
account conflict
|
2011-12-21 13:30:09 +05:30 |
|
Nijil Y
|
0f9eaeaa3c
|
updation Merge branch 'master' of git://github.com/webnotes/erpnext
Conflicts:
erpnext/projects/doctype/ticket/ticket.py
|
2011-12-21 12:34:13 +05:30 |
|
Nabin Hait
|
60fc54a9ba
|
Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form
|
2011-12-20 18:59:26 +05:30 |
|
Nijil Y
|
04da8741c3
|
fix
|
2011-12-20 18:09:43 +05:30 |
|
Nijil Y
|
8dd861bda5
|
Auto Indent creation when stock reaches re-order level
|
2011-12-20 17:17:51 +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
|
630256f65b
|
purchase recipt detail
|
2011-12-08 13:01:43 +05:30 |
|
Nabin Hait
|
142af06d19
|
update serial no incoming rate through landing cost wizard
|
2011-11-25 16:37:21 +05:30 |
|
Nabin Hait
|
28b793c88a
|
incoming rate in serial no should be valuation rate instead of pur rate
|
2011-11-25 14:43:11 +05:30 |
|
Nijil
|
1530b93a6e
|
purchase recipt
|
2011-11-24 15:53:56 +05:30 |
|
Nabin Hait
|
d6ed0748a3
|
help content midified
|
2011-11-24 14:47:18 +05:30 |
|
Nabin Hait
|
816383056f
|
On deletion of warehouse, delete bin and sle if no qty
|
2011-11-23 12:58:03 +05:30 |
|
Nabin Hait
|
04176e62d8
|
fixed error in internal reco
|
2011-11-23 12:15:42 +05:30 |
|
Nabin Hait
|
fc26f64011
|
rewritten stock reconciliation
|
2011-11-21 17:13:53 +05:30 |
|
Nabin Hait
|
a8da0fecb5
|
Account link query changed in LC wizard
|
2011-11-17 14:47:05 +05:30 |
|
Nabin Hait
|
f164b269db
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-11-16 16:39:16 +05:30 |
|
Nabin Hait
|
9dd6330418
|
updated landed cost wizard
|
2011-11-16 16:38:55 +05:30 |
|
Nabin Hait
|
815a75f917
|
Rewritten landed cost wizard
|
2011-11-16 16:34:53 +05:30 |
|
Nabin Hait
|
b0fa2af45b
|
Rewritten landed cost wizard
|
2011-11-16 16:20:37 +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
|
e098481f45
|
Pull items from BOM for production issue
|
2011-11-10 10:56:53 +05:30 |
|
Nabin Hait
|
93ba4fbaa4
|
Fixes related to finding prev sle
|
2011-11-08 15:30:04 +05:30 |
|
Nabin Hait
|
235439df5b
|
bin fixes for reposting future entries
|
2011-11-08 12:52:51 +05:30 |
|
Nabin Hait
|
76228f1c79
|
bin fixes for reposting future entries
|
2011-11-08 12:49:24 +05:30 |
|
Rushabh Mehta
|
d77cb27bd2
|
fixes to bin for reposting future entires
|
2011-11-08 12:06:02 +05:30 |
|
Rushabh Mehta
|
9666e657ce
|
fixed fpe in bin
|
2011-10-24 14:35:04 +05:30 |
|
Rushabh Mehta
|
06f432f4c7
|
fixes to valuation control
|
2011-10-24 11:59:22 +05:30 |
|
Rushabh Mehta
|
09dba5cf1d
|
fixes to valuation control
|
2011-10-24 11:17:36 +05:30 |
|
Nabin Hait
|
57dd62d790
|
project column moved to item table in pur cycle
|
2011-10-20 19:19:07 +05:30 |
|
Nabin Hait
|
7762bdaf77
|
Letter head issue fixed in print format
|
2011-10-19 15:05:26 +05:30 |
|
Nabin Hait
|
0c005421fe
|
Packing slip issues fixed and modified print format
|
2011-10-18 16:44:20 +05:30 |
|
Nabin Hait
|
a315a31919
|
Issue fixed in get stock qty if bin not exists
|
2011-10-17 15:01:31 +05:30 |
|
Nabin Hait
|
ee9efb568b
|
flds added in mapper
|
2011-10-12 12:42:07 +05:30 |
|
Nabin Hait
|
685564f71d
|
Resolved conflict after merging with master
|
2011-10-11 14:42:34 +05:30 |
|
Nabin Hait
|
fb37157163
|
packing slip related changes and test case for item
|
2011-10-11 13:57:48 +05:30 |
|
Nabin Hait
|
c1d4281718
|
packing slip related changes
|
2011-10-11 12:50:55 +05:30 |
|
Rushabh Mehta
|
6edb4635e6
|
fixed bugs
|
2011-10-11 10:50:23 +05:30 |
|
Nabin Hait
|
15cad19d7c
|
Serial No moved to Stock module from Support module
|
2011-10-10 17:10:24 +05:30 |
|
Nabin Hait
|
d08fe6099a
|
map schedule date from po to pr
|
2011-10-07 12:11:19 +05:30 |
|
Nabin Hait
|
1971942db8
|
purchase tax mapping while pulling
|
2011-10-05 14:56:16 +05:30 |
|
Nabin Hait
|
88f9cb5d24
|
Test case added for MTN
|
2011-09-30 17:20:06 +05:30 |
|
Nabin Hait
|
79e8247d82
|
fix in stock ledger
|
2011-09-29 10:40:04 +05:30 |
|
Nabin Hait
|
fff40599e8
|
test field deleted from warehouse
|
2011-09-29 10:39:44 +05:30 |
|
Nabin Hait
|
8c9a5af231
|
Error fixed in bin
|
2011-09-16 12:51:19 +05:30 |
|
Nabin Hait
|
ecc75123e8
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-15 15:40:53 +05:30 |
|
Nabin Hait
|
6ae7f8fe58
|
check serial nos bin qty only if serial no entered into the document
|
2011-09-15 15:40:27 +05:30 |
|
Rushabh Mehta
|
53ba83158c
|
fixes to startup
|
2011-09-15 15:06:23 +05:30 |
|
Rushabh Mehta
|
2773940db1
|
merged from master
|
2011-09-15 12:55:25 +05:30 |
|
Rushabh Mehta
|
1e11cb486d
|
merging from master and usability fixes to setup
|
2011-09-14 13:25:10 +05:30 |
|
Rushabh Mehta
|
5f50617121
|
removed readme
|
2011-09-13 15:48:51 +05:30 |
|
Rushabh Mehta
|
8cf45175a7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-08 14:17:41 +05:30 |
|
Rushabh Mehta
|
66ac2b018a
|
first cut for lazy loading framework
|
2011-09-05 18:43:09 +05:30 |
|