Anand Doshi
|
d29465029d
|
Fixed Test Cases frappe/frappe#478
|
2014-04-08 20:15:22 +05:30 |
|
Anand Doshi
|
cd71e1d8ab
|
Test Cases - Journal Voucher, Purchase Invoice, Period Closing Voucher frappe/frappe#478
|
2014-04-08 13:53:35 +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 |
|
Nabin Hait
|
365ae27acf
|
frappe/frappe#478 fixes
|
2014-04-03 17:38:54 +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
|
f191f854cd
|
frappe/frappe#478 erpnext install works
|
2014-04-02 18:09:34 +05:30 |
|
Anand Doshi
|
5b552b51f1
|
frappe/frappe#478
|
2014-04-02 15:03:35 +05:30 |
|
Rushabh Mehta
|
f2227d033c
|
frappe/frappe#478, removed instances of .fields
|
2014-03-31 23:37:40 +05:30 |
|
Rushabh Mehta
|
231f6a5b58
|
frappe/frappe#478 added test_records.json
|
2014-03-31 23:05:12 +05:30 |
|
Rushabh Mehta
|
0a0f2495a2
|
frappe/frappe#478, frappe tests pass, .txt renamed to .json
|
2014-03-31 17:27:06 +05:30 |
|
Nabin Hait
|
0e13cd5ac9
|
frappe/frappe#478
|
2014-03-28 17:01:32 +05:30 |
|
Nabin Hait
|
0d8d30e1cc
|
frappe/frappe#478
|
2014-03-28 16:57:21 +05:30 |
|
Rushabh Mehta
|
b385ecf65e
|
frappe/frappe#478
|
2014-03-28 16:54:45 +05:30 |
|
Anand Doshi
|
81ba0b29da
|
frappe/frappe#478
|
2014-03-28 15:23:26 +05:30 |
|
Anand Doshi
|
f78d1aee28
|
Replaced doc, doc.fields frappe/frappe#478
|
2014-03-28 13:55:00 +05:30 |
|
Anand Doshi
|
40534f076b
|
Changed creation, modified format frappe/frappe#478
|
2014-03-28 12:46:53 +05:30 |
|
Rushabh Mehta
|
daae743608
|
frappe/frappe#478
|
2014-03-27 17:54:18 +05:30 |
|
Rushabh Mehta
|
e88bc8b12a
|
frappe/frappe#478
|
2014-03-27 17:51:41 +05:30 |
|
Rushabh Mehta
|
d2b34dc30c
|
frappe/frappe#478
|
2014-03-27 16:12:56 +05:30 |
|
Rushabh Mehta
|
66d52b55c0
|
#478
|
2014-03-27 14:17:33 +05:30 |
|
Rushabh Mehta
|
aa355af2cf
|
refactored client side Model and Meta - frappe/frappe#478
|
2014-03-26 18:24:30 +05:30 |
|
Nabin Hait
|
d6e4ab3fd4
|
maintenance schedule: validate amc dates and update in serial no
|
2014-03-26 10:23:27 +05:30 |
|
Nabin Hait
|
0c9d42258c
|
Minor fix related to pos paid amount
|
2014-03-25 19:35:41 +05:30 |
|
Nabin Hait
|
2c517e0a62
|
Fixes related to countrywise coa
|
2014-03-25 18:28:49 +05:30 |
|
Nabin Hait
|
73083dc960
|
Fix related to user_default
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
482ffac83f
|
Set paid amount to zero if not pos
|
2014-03-21 11:26:07 +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 |
|
Nabin Hait
|
54106807e4
|
Set paid amount to zero if not pos
|
2014-03-13 17:26:41 +05:30 |
|
Nabin Hait
|
a8dbb0dd41
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-03-13 17:23:24 +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
|
d8de921c40
|
fixed erpnext/frappe#1441 and other pos related cleanups
|
2014-03-06 15:40:22 +05:30 |
|
Rushabh Mehta
|
73f0bf36c1
|
fixed #1454
|
2014-03-06 14:45:02 +05:30 |
|
Rushabh Mehta
|
4541875c81
|
removed searchfield condition from get_match_cond frappe/erpnext#1457
|
2014-03-06 11:19:46 +05:30 |
|
Anand Doshi
|
2d5727b17b
|
Ignore mandatory during email pulling
|
2014-03-05 19:24:07 +05:30 |
|
Nabin Hait
|
2d57b0aa52
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-03-05 10:51:04 +05:30 |
|
Anand Doshi
|
64f2ccd9e1
|
Global Settings in Setup, Sales Master Manager can restrict for Customer
|
2014-03-03 19:28:30 +05:30 |
|
Anand Doshi
|
f5794f1c07
|
Module Home Pages using Module View
|
2014-03-03 15:06:34 +05:30 |
|
Nabin Hait
|
8e4640f464
|
minor fix in report
|
2014-03-03 12:06:50 +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 |
|
Anand Doshi
|
e9baaa68e7
|
Changed frappe.conn to frappe.db
|
2014-02-26 12:35:33 +05:30 |
|
Anand Doshi
|
4362443b6e
|
Propagate ignore_permissions during mapping from quotation to sales order
|
2014-02-25 15:42:32 +05:30 |
|
Anand Doshi
|
201dbbd977
|
Quotation Item Table can be empty
|
2014-02-25 15:42:32 +05:30 |
|
Nabin Hait
|
22831563ff
|
default value in selling settings
|
2014-02-19 18:35:54 +05:30 |
|
Nabin Hait
|
74bbd24b1d
|
Merge github.com:frappe/erpnext into develop
|
2014-02-19 17:43:51 +05:30 |
|
Nabin Hait
|
9d1f077922
|
get lead details in quotation
|
2014-02-19 17:43:24 +05:30 |
|
Rushabh Mehta
|
e0e3f92019
|
fixed sales / accounts tree
|
2014-02-19 12:43:16 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
9ea461638e
|
minor fix
|
2014-02-14 13:40:41 +05:30 |
|
Nabin Hait
|
66b2717c54
|
Merge pull request #1414 from akhileshdarjee/4.0-hotfix
Customer and Supplier dashboard set to company currency
|
2014-02-12 16:55:17 +05:30 |
|
Nabin Hait
|
139dc7b9b2
|
minor fixes
|
2014-02-12 14:54:16 +05:30 |
|
Nabin Hait
|
0aa71a5c41
|
minor fixes
|
2014-02-12 14:54:15 +05:30 |
|
Nabin Hait
|
5f59726903
|
Rename fields: replaced in html and txt files
|
2014-02-12 14:54:15 +05:30 |
|
Nabin Hait
|
1eb560130a
|
Rename fields: amount related fields
|
2014-02-12 14:54:14 +05:30 |
|
Nabin Hait
|
7979f7ed21
|
Field Rename: rate field mass replacement
|
2014-02-12 14:54:14 +05:30 |
|
Nabin Hait
|
a7f757a3f4
|
Rename fields: initial commit
|
2014-02-12 14:54:13 +05:30 |
|
Nabin Hait
|
777397489e
|
Fields renamed in schema
|
2014-02-12 14:54:13 +05:30 |
|
Nabin Hait
|
436f526102
|
commonify get_item_details and rename fields to sync selling and purchase
|
2014-02-12 14:54:12 +05:30 |
|
Akhilesh Darjee
|
f2b7cd65a9
|
customer and supplier dashboard set to company currency
|
2014-02-12 11:29:08 +05:30 |
|
Anand Doshi
|
d7cc47e3ac
|
Do not validate Material Request against Sales Order, Moved Setup page to Framework
|
2014-02-10 17:39:12 +05:30 |
|
Nabin Hait
|
a03f654446
|
Merge pull request #1382 from akhileshdarjee/4.0-hotfix
Newsletter can also be sent to employees
|
2014-02-06 16:02:39 +05:30 |
|
Nabin Hait
|
574c7e7c63
|
item related cleanup
|
2014-02-06 15:51:01 +05:30 |
|
Akhilesh Darjee
|
462740f72b
|
sales funnel fix
|
2014-02-06 13:14:15 +05:30 |
|
Anand Doshi
|
3decf4dbc5
|
Fixes related website hierarchy
|
2014-02-06 12:50:35 +05:30 |
|
Akhilesh Darjee
|
81578d2e77
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-02-03 17:48:46 +05:30 |
|
Akhilesh Darjee
|
8f674fe0fb
|
minor changes
|
2014-02-03 17:47:50 +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
|
dfae0ea570
|
minor fix in patch
|
2014-01-31 17:25:09 +05:30 |
|
Nabin Hait
|
7f80485070
|
Merge pull request #1374 from akhileshdarjee/sms-center
SMS center character count
|
2014-01-31 02:57:35 -08:00 |
|
Akhilesh Darjee
|
4e3b601990
|
webnotes/erpnext#1188 sms center character count
|
2014-01-30 19:13:25 +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 |
|
Nabin Hait
|
b87e9f2651
|
Fixes in fetching party details
|
2014-01-29 19:51:36 +05:30 |
|
Akhilesh Darjee
|
b665d86292
|
patch to reload all sales and purchase doctypes and print formats
|
2014-01-29 17:40:34 +05:30 |
|
Akhilesh Darjee
|
4f7215662d
|
webnotes/erpnext#1090 set default tax type in customer and supplier
|
2014-01-29 16:31:38 +05:30 |
|
Rushabh Mehta
|
24da761a17
|
more updates to party
|
2014-01-29 15:26:04 +05:30 |
|
Akhilesh Darjee
|
2ced3b07d4
|
changed fieldname from charge to taxes
|
2014-01-28 19:16:05 +05:30 |
|
Rushabh Mehta
|
49dd7bee87
|
added get_supplier_details and commonified invoice functions
|
2014-01-28 17:43:10 +05:30 |
|
Nabin Hait
|
21d324c597
|
Merged with 4.0-wip
|
2014-01-28 15:52:25 +05:30 |
|
Akhilesh Darjee
|
ffa4769b51
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-01-27 17:32:32 +05:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +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 |
|
Akhilesh Darjee
|
a4e0a1c061
|
minor changes
|
2014-01-24 19:57:52 +05:30 |
|
Rushabh Mehta
|
1cd96a136f
|
updates for restriction
|
2014-01-24 11:10:24 +05:30 |
|
Rushabh Mehta
|
f96bcf943b
|
added explicit delete perimssions
|
2014-01-20 17:52:13 +05:30 |
|
Nabin Hait
|
5c6d13a0df
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:18:16 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Nabin Hait
|
f6cf5e0f43
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-cleanup
|
2014-01-06 17:36:04 +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 |
|
Akhilesh Darjee
|
5c96b75a68
|
fixed maintenance schedule
|
2014-01-02 17:54:12 +05:30 |
|
Rushabh Mehta
|
b09d9dabc5
|
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
|
2014-01-02 11:47:23 +05:30 |
|
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 |
|
Anand Doshi
|
9a4a13cb73
|
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
|
2013-12-31 17:38:21 +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 |
|
Akhilesh Darjee
|
d203aea7c2
|
[flat discount] flat discount implemented on sales cycle
|
2013-12-27 17:49:57 +05:30 |
|
Rushabh Mehta
|
c4a0ed63ef
|
Moved demo to separate app, moved patches folder
|
2013-12-27 17:30:24 +05:30 |
|
Rushabh Mehta
|
4ac68952e8
|
Moved patches and fixed method routing in pages
|
2013-12-27 13:43:40 +05:30 |
|
Anand Doshi
|
8e332ffd16
|
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
|
2013-12-26 19:12:51 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Rushabh Mehta
|
df200f305b
|
Redesigned templates. Now all templates must be inside templates/pages templates/generators
|
2013-12-25 15:19:22 +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 |
|
Anand Doshi
|
1fc9ae2230
|
Fixes and Validations for nested doctypes
|
2012-09-24 14:00:59 +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 |
|
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 |
|
Anand Doshi
|
4de55b6f6b
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-10 14:44:03 +05:30 |
|
Nabin Hait
|
eb9f6eda02
|
order type fix in quote/SO
|
2012-09-10 14:36:49 +05:30 |
|
Anand Doshi
|
e67bcc38b4
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-06 17:51:05 +05:30 |
|
Anand Doshi
|
f480dc9d2e
|
fix in opportunity to quotation fetch
|
2012-09-06 17:50:44 +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
|
b211a41547
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-31 13:39:58 +05:30 |
|
Anand Doshi
|
00d3c7c67d
|
open communication in dialog
|
2012-08-31 13:25:03 +05:30 |
|
Anand Doshi
|
62a3881837
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-30 18:17:20 +05:30 |
|
Nabin Hait
|
fff16c337d
|
fixes in over billing validation
|
2012-08-29 12:07:32 +05:30 |
|
Nabin Hait
|
9c043b2f51
|
Billed amount in SO and DN based on export amount and patch for it
|
2012-08-29 11:46:12 +05:30 |
|
Anand Doshi
|
998d39f71b
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-24 12:17:33 +05:30 |
|
Anand Doshi
|
ba278000d7
|
edit / add nodes allowed in sales browser, only if user has valid permissions
|
2012-08-24 12:15:44 +05:30 |
|
Rushabh Mehta
|
24fabf3b73
|
cleaned up source from lead
|
2012-08-06 15:21:35 +05:30 |
|
Rushabh Mehta
|
f83159edbe
|
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
|
2012-08-06 10:17:38 +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
|
384b61749e
|
added 'blog_subscriber' and 'unsubscribed' fields
|
2012-08-03 14:09:32 +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
|
cf546d547d
|
fix in quotation item's get query
|
2012-08-01 12:05:13 +05:30 |
|
Anand Doshi
|
96efd2ba9b
|
fix in quotation item's get query
|
2012-08-01 12:00:30 +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 |
|
Anand Doshi
|
e87482ac86
|
Fixed: Lead Lost Reason message
|
2012-07-26 12:48:26 +05:30 |
|
Anand Doshi
|
486f9dfcec
|
added unicode_literals import at start of each file
|
2012-07-19 13:40:31 +05:30 |
|
Anand Doshi
|
5756630efb
|
Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
public/js/all-app.js
|
2012-07-18 20:31:37 +05:30 |
|
Anand Doshi
|
249659d673
|
Changed file names from listview.js to doctype_name_list.js
|
2012-07-18 20:25:58 +05:30 |
|
Anand Doshi
|
f2f5c94c41
|
Default Currency specification for Customer and Supplier
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
|
2012-07-18 20:13:52 +05:30 |
|
Nabin Hait
|
18b9eccdfa
|
packing list issue fixed
|
2012-07-18 13:31:08 +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 |
|
Nabin Hait
|
8b091cd864
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-16 16:35:10 +05:30 |
|
Nabin Hait
|
a25ebe3dbf
|
Conversion rate fieldtype set as float (from currency)
|
2012-07-16 16:34:28 +05:30 |
|
Anand Doshi
|
2f192a6167
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-16 16:33:22 +05:30 |
|
Anand Doshi
|
8499773db8
|
fix in last sales and quote rate in quotation
|
2012-07-16 16:33:10 +05:30 |
|
Rushabh Mehta
|
527c5b6da5
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-16 15:45:18 +05:30 |
|
Rushabh Mehta
|
3c419c5e05
|
cur_frm.doc re-reference when is called
|
2012-07-16 15:44:38 +05:30 |
|
Nabin Hait
|
65535da220
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-16 15:38:41 +05:30 |
|
Nabin Hait
|
49e170153e
|
Include in print rate validation added
|
2012-07-16 15:38:11 +05:30 |
|
Anand Doshi
|
e7c54a4714
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-16 15:16:27 +05:30 |
|
Anand Doshi
|
7f2385cee9
|
Merge branch 'master' into dev
|
2012-07-16 15:15:34 +05:30 |
|
Anand Doshi
|
59fa430be3
|
fixes in quotation item code get query
|
2012-07-16 15:15:24 +05:30 |
|
Rushabh Mehta
|
9e9809a44f
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-16 14:17:22 +05:30 |
|
Rushabh Mehta
|
2eef40bf1e
|
get_field > wn.meta.get_docfield
|
2012-07-16 14:16:57 +05:30 |
|
Nabin Hait
|
8f5cd388cc
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-16 12:50:25 +05:30 |
|
Nabin Hait
|
388e09834c
|
Check duplicate SO entry for same po no and customer
|
2012-07-16 12:49:52 +05:30 |
|
Anand Doshi
|
bb81c198f5
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-07-13 16:48:08 +05:30 |
|
Anand Doshi
|
9ec8024db7
|
show order type icon in sales order list view
|
2012-07-13 16:46: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
|
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
|
5faf37f312
|
item group cleanup
|
2012-07-12 11:33:00 +05:30 |
|
Rushabh Mehta
|
cf969143f2
|
cleaned up customer group
|
2012-07-12 09:54:43 +05:30 |
|
Rushabh Mehta
|
b9fabf8e16
|
sales bom cleanup
|
2012-07-11 19:18:50 +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
|
95a822c701
|
Fetch Customer's Item Code in Sales Transaction
|
2012-07-09 11:09:07 +05:30 |
|
Nabin Hait
|
cb2e76a79c
|
delete row issue in grid fixed
|
2012-07-05 14:44:39 +05:30 |
|
Anand Doshi
|
d383e573fc
|
contact, address list views and allow their deletion from customer / supplier form
|
2012-07-02 19:45:35 +05:30 |
|
Anand Doshi
|
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 |
|
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
|
318eab813c
|
delete customer account on deletion of customer record
|
2012-06-22 13:35:13 +05:30 |
|
Anand Doshi
|
2939a0ea65
|
fetch price list rates when creating quotation from opportunity
|
2012-06-21 11:20:37 +05:30 |
|
Anand Doshi
|
f8946b1e31
|
fix in buttons displayed - on change of status in lead form
|
2012-06-18 18:04:28 +05:30 |
|
Anand Doshi
|
7d1e8f218b
|
change date field for sales invoice in sales personwise transaction summary search criteria
|
2012-06-14 18:11:36 +05:30 |
|
Rushabh Mehta
|
4c56275d26
|
appframe is now heading
|
2012-06-14 11:05:09 +05:30 |
|
Anand Doshi
|
7deaff1979
|
fixed default tax fetch issue
|
2012-06-13 14:20:24 +05:30 |
|
Anand Doshi
|
0146ddcfc6
|
delete communication log for supplier and customer, on trash
|
2012-06-12 14:09:44 +05:30 |
|
Anand Doshi
|
89e2b3bda4
|
minor fix in lead's listview
|
2012-06-12 13:11:29 +05:30 |
|
Anand Doshi
|
3b6eda3b45
|
fix in listviews of lead, customer and supplier
|
2012-06-12 13:08:57 +05:30 |
|
Nabin Hait
|
be5e5059c3
|
Lead Organization field added in quotation
|
2012-06-08 16:15:08 +05:30 |
|
Nabin Hait
|
2e3579a4eb
|
Item Barcode implemented
|
2012-06-07 19:09:17 +05:30 |
|
Anand Doshi
|
dbb84a271e
|
Merge branch 'master' of github.com:webnotes/erpnext into comm_log
Conflicts:
erpnext/selling/doctype/lead/lead.js
erpnext/setup/doctype/contact_control/contact_control.js
|
2012-06-05 18:37:17 +05:30 |
|
Nabin Hait
|
e315aba130
|
expected delivery date mandatory only if order type is sales
|
2012-06-01 10:11:14 +05:30 |
|
Anand Doshi
|
a6708fb748
|
new doctype: communication
|
2012-05-31 14:53:55 +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
|
82695ddd90
|
fixes in transaction history of customer and supplier
|
2012-05-29 14:14:27 +05:30 |
|
Anand Doshi
|
2ac77beb50
|
fix in packing list issue
|
2012-05-29 11:29:52 +05:30 |
|
Anand Doshi
|
2ad2426610
|
fix in get other charges of sales_common.py
|
2012-05-28 16:05:54 +05:30 |
|
Anand Doshi
|
041cea763e
|
fix in stock ledger entry for items have sales bom
|
2012-05-25 17:49:37 +05:30 |
|
Anand Doshi
|
16cf4fa806
|
fix in get_item_list, which was causing negative stock error
|
2012-05-25 16:54:27 +05:30 |
|
Anand Doshi
|
fcbd2ad792
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-23 18:27:29 +05:30 |
|
Anand Doshi
|
9da0bf6106
|
fix in customer address contact report
|
2012-05-23 18:27:05 +05:30 |
|
Nabin Hait
|
4aaaa8af7b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-23 16:22:41 +05:30 |
|
Nabin Hait
|
2b06b903a5
|
Merge branch 'shf_rename'
|
2012-05-23 16:22:24 +05:30 |
|
Nabin Hait
|
517eacf9e3
|
packing list code updated for duplicate items in item table
|
2012-05-23 16:21:39 +05:30 |
|
Anand Doshi
|
9327bb9585
|
fix in tag viewing in doclistview
|
2012-05-23 15:12:22 +05:30 |
|
Nabin Hait
|
86df78aabc
|
fixed conflict
|
2012-05-23 11:33:28 +05:30 |
|
Anand Doshi
|
38830ddae1
|
removed console log in customer.js
|
2012-05-23 10:55:59 +05:30 |
|
Nabin Hait
|
611157447f
|
sms fix
|
2012-05-22 17:25:39 +05:30 |
|
Anand Doshi
|
e780f661a7
|
fix in transaction history
|
2012-05-22 17:04:33 +05:30 |
|
Nabin Hait
|
86375f089a
|
Merge branch 'shf_rename'
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-21 15:48:21 +05:30 |
|
Nabin Hait
|
cba9c716f2
|
Remove all those parent items from packing details which are no longer present in main item table
|
2012-05-21 15:35:23 +05:30 |
|
Nabin Hait
|
fec3f783af
|
custom field included in docfield query
|
2012-05-21 14:40:25 +05:30 |
|
Anand Doshi
|
1aae261490
|
delete button in doclistview
|
2012-05-21 14:31:03 +05:30 |
|
Anand Doshi
|
df914991c4
|
Merge branch 'shf_rename'
|
2012-05-18 18:21:43 +05:30 |
|
Anand Doshi
|
bde13a655f
|
moved uom next to qty in quotation item
|
2012-05-18 18:21:29 +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
|
acd291a228
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-18 11:50:08 +05:30 |
|
Nabin Hait
|
c1f1702e22
|
so pending item patch
|
2012-05-18 11:43:10 +05:30 |
|
Anand Doshi
|
fc9145425d
|
Fixes in Print Formats - discount in description
|
2012-05-17 18:11:54 +05:30 |
|
Nabin Hait
|
7a13b238cb
|
fixes in sales order pending items report
|
2012-05-17 18:06:14 +05:30 |
|
Anand Doshi
|
c7e26873c0
|
Merge branch 'shf_rename'
|
2012-05-17 15:28:54 +05:30 |
|
Nabin Hait
|
8b2473cc40
|
report fixed: sales persons target variance (item group wise)
|
2012-05-17 12:47:48 +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
|
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
|
7483ae9573
|
fix in button disablity leading to double click
|
2012-05-11 16:23:41 +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 |
|
Anand Doshi
|
3fa25faca2
|
fixes after merge with cms
|
2012-05-10 15:15:43 +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
|
7f82256394
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-09 15:27:03 +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 |
|
Rushabh Mehta
|
e45042e011
|
merge
|
2012-05-09 12:22:50 +05:30 |
|
Anand Doshi
|
c241a476ab
|
moved shipping address in basic info section
|
2012-05-09 11:07:15 +05:30 |
|
Rushabh Mehta
|
458ca8eddb
|
cms fixes
|
2012-05-09 10:17:08 +05:30 |
|
Rushabh Mehta
|
a920943e43
|
new cms with public folder
|
2012-05-07 18:00:57 +05:30 |
|
Rushabh Mehta
|
252664e288
|
remove unsupported for google
|
2012-05-07 10:43:18 +05:30 |
|
Nabin Hait
|
7c60fc13b2
|
reports fixed: itemwise sales/delivery report
|
2012-05-03 18:22:32 +05:30 |
|
Nabin Hait
|
d8df7b5884
|
quotation fix
|
2012-05-03 17:49:45 +05:30 |
|
Nabin Hait
|
dc7ffe47b2
|
fixes in quotation
|
2012-05-03 14:55:21 +05:30 |
|
Nabin Hait
|
16b6386648
|
fixes in quotation
|
2012-05-03 14:41:35 +05:30 |
|
Nabin Hait
|
32826a8cf1
|
fixes in customerwise price list
|
2012-05-03 13:10:34 +05:30 |
|
Nabin Hait
|
ab96d12086
|
fixes in customerwise price list
|
2012-05-02 12:19:33 +05:30 |
|
Anand Doshi
|
98ae634c50
|
fixes in sales order item widths
|
2012-05-01 18:31:40 +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 |
|
Rushabh Mehta
|
79a664b4dc
|
cleaned up lead, opportunity, jv
|
2012-04-30 16:12:03 +05:30 |
|
Nabin Hait
|
41cc32790f
|
Fixed issie in auto notification
|
2012-04-30 14:36:18 +05:30 |
|
Nabin Hait
|
50c799880a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-26 12:47:30 +05:30 |
|
Nabin Hait
|
663e971557
|
Make next document button hide/unhide
|
2012-04-24 11:39:54 +05:30 |
|
Nabin Hait
|
6ed865f89a
|
Fld label based on currency
|
2012-04-23 10:37:28 +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
|
b301251090
|
Store base currency on client side
|
2012-04-20 11:51:27 +05:30 |
|
Nabin Hait
|
239e79038f
|
Customer/customer group wise price list
|
2012-04-20 10:25:03 +05:30 |
|
Anand Doshi
|
44f16eaefa
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-17 13:00:01 +05:30 |
|
Anand Doshi
|
b9e9197e5f
|
fix in doclistview - check if _user_tags exists before rendering
|
2012-04-17 12:59:18 +05:30 |
|
Rushabh Mehta
|
38bdf6c5e7
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-17 12:41:04 +05:30 |
|
Rushabh Mehta
|
2146fd17e7
|
new sales_browser
|
2012-04-17 12:40:37 +05:30 |
|
Anand Doshi
|
24e18569d9
|
fixes in install docs for roles
|
2012-04-17 11:45:35 +05:30 |
|
Nabin Hait
|
6f89f1eb86
|
fixes in sales cycle
|
2012-04-16 14:44:47 +05:30 |
|
Nabin Hait
|
eb3bb01431
|
Update erpnext/selling/doctype/sales_order/sales_order.js
|
2012-04-16 13:41:06 +05:30 |
|
Nabin Hait
|
6c615d9527
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-13 14:14:39 +05:30 |
|
Anand Doshi
|
7aafb7e19e
|
Purchase Requisition to Purchase Request
|
2012-04-13 11:52:17 +05:30 |
|
Rushabh Mehta
|
97ae17eaf7
|
merge
|
2012-04-13 11:42:56 +05:30 |
|
Rushabh Mehta
|
f1264a7f76
|
listing, module pages in appframe
|
2012-04-13 11:41:43 +05:30 |
|
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 |
|
Anand Doshi
|
09e8c4cd2d
|
further fixes
|
2012-04-12 17:51:53 +05:30 |
|
Anand Doshi
|
5ed0b6971c
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-11 17:51:12 +05:30 |
|
Anand Doshi
|
e68fe505b9
|
custom fields creation patch - not to be executed automatically
|
2012-04-11 17:49:21 +05:30 |
|
Nabin Hait
|
c594bbcae0
|
address html issue fixed
|
2012-04-11 17:14:45 +05:30 |
|
Anand Doshi
|
87a2c5cc69
|
Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
Conflicts:
erpnext/accounts/doctype/c_form/c_form.txt
erpnext/patches/patch_list.py
erpnext/setup/doctype/permission_control/permission_control.py
|
2012-04-09 12:14:53 +05:30 |
|
Anand Doshi
|
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 |
|
Nabin Hait
|
9ba2e49468
|
Update erpnext/selling/doctype/sales_common/sales_common.js
|
2012-04-05 16:54:19 +05:30 |
|
Nabin Hait
|
758eed555c
|
Update erpnext/selling/doctype/sales_common/sales_common.js
|
2012-04-05 16:45:33 +05:30 |
|
Nabin Hait
|
f77c940fcf
|
fixed price list currency issue
|
2012-04-05 16:29:02 +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 |
|
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 |
|
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
|
779a365420
|
fix in print hide of amount in words
|
2012-03-28 18:31:26 +05:30 |
|
Anand Doshi
|
c9456c18dc
|
listviews
|
2012-03-28 17:48:30 +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 |
|
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
|
5f9501d4d8
|
Merge branch 'sync_file_db' into shf_merge
Conflicts:
erpnext/projects/doctype/project/project.txt
|
2012-03-23 14:51:35 +05:30 |
|
Anand Doshi
|
134ca41db8
|
Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db
|
2012-03-23 12:45:05 +05:30 |
|
Anand Doshi
|
358304d216
|
fix in sales common regarding date formatting
|
2012-03-23 11:12:03 +05:30 |
|
Rushabh Mehta
|
1952f5b033
|
lead listview
|
2012-03-22 12:21:56 +05:30 |
|
Rushabh Mehta
|
6ac1d73731
|
lead listview
|
2012-03-22 12:10:49 +05:30 |
|
Rushabh Mehta
|
3f46696db2
|
removed slider ui
|
2012-03-22 11:37:08 +05:30 |
|
Nabin Hait
|
0ad2ef2111
|
sync with respect to file
|
2012-03-21 15:02:39 +05:30 |
|
Rushabh Mehta
|
a665c1f60d
|
stylefixes and listviews
|
2012-03-21 11:47:58 +05:30 |
|
Rushabh Mehta
|
437c1b512c
|
listview update and form fix
|
2012-03-20 18:45:28 +05:30 |
|
Nabin Hait
|
9ff92369ad
|
lead organization fld added in quotation for printing
|
2012-03-20 16:44:15 +05:30 |
|
Rushabh Mehta
|
9b1afe197d
|
cleanup of form, rename, route, added fonts
|
2012-03-20 14:37:44 +05:30 |
|
Nabin Hait
|
31e0eacb7a
|
Update erpnext/selling/doctype/sales_order/sales_order.js
|
2012-03-19 18:54:11 +05:30 |
|
Nabin Hait
|
fdab486720
|
Update erpnext/selling/doctype/sales_order/sales_order.js
|
2012-03-19 18:43:07 +05:30 |
|
Nabin Hait
|
422f7e99db
|
Update erpnext/selling/doctype/customer/customer.txt
|
2012-03-19 15:37:03 +05:30 |
|
Rushabh Mehta
|
7afaa8665d
|
major reworking of page navigation
|
2012-03-16 18:28:09 +05:30 |
|
Nabin Hait
|
deac31fd2d
|
Update erpnext/selling/doctype/sales_common/sales_common.py
|
2012-03-16 15:14:27 +05:30 |
|
Nabin Hait
|
15afe87984
|
cost center will be fetched from other charges master
|
2012-03-16 15:11:02 +05:30 |
|
Rushabh Mehta
|
2438de4c9b
|
fixed tags in list2
|
2012-03-15 16:43:46 +05:30 |
|
Rushabh Mehta
|
08b670bddd
|
listing with stats
|
2012-03-14 19:06:20 +05:30 |
|
Rushabh Mehta
|
052b7e4049
|
fixed list->new->onload hooks
|
2012-03-13 15:19:06 +05:30 |
|
Rushabh Mehta
|
b9878d01e1
|
style fixes
|
2012-03-12 16:12:09 +05:30 |
|
Rushabh Mehta
|
9f89e35ebe
|
search selector fix for link
|
2012-03-09 17:51:39 +05:30 |
|
Rushabh Mehta
|
519f70b384
|
new autosuggest, other fixes
|
2012-03-09 16:44:21 +05:30 |
|
Rushabh Mehta
|
9a1bdf7224
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-07 18:20:33 +05:30 |
|
Rushabh Mehta
|
f81a64e57f
|
new listing and changed wn.widgets.listing to wn.ui.listing
|
2012-03-07 18:19:41 +05:30 |
|
Nabin Hait
|
928e89a359
|
validation added in enquire
|
2012-03-07 13:11:24 +05:30 |
|
Rushabh Mehta
|
15da133de9
|
removed
|
2012-03-06 18:41:11 +05:30 |
|
Rushabh Mehta
|
60871c3f54
|
merge, doclist2
|
2012-03-05 18:29:34 +05:30 |
|
Rushabh Mehta
|
b9004bd6d0
|
doclist2
|
2012-03-05 18:28:33 +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 |
|
Nabin Hait
|
40c514612b
|
price list rate hiding issue
|
2012-03-02 16:06:33 +05:30 |
|
Nabin Hait
|
7e6b62eafd
|
print hide issue
|
2012-03-02 15:12:52 +05:30 |
|
Nabin Hait
|
fae852eb78
|
print hide issue
|
2012-03-02 15:10:51 +05:30 |
|
Nabin Hait
|
0d155a9135
|
print hide issue
|
2012-03-02 14:57:44 +05:30 |
|
Nabin Hait
|
88986ca007
|
column break print hide issue
|
2012-03-02 12:29:08 +05:30 |
|
Anand Doshi
|
e306a1f5e1
|
fix in sales and purchase common column hide
|
2012-03-01 19:25:33 +05:30 |
|
Nabin Hait
|
96639d76b2
|
fixed indentation issue for custom script
|
2012-03-01 18:11:27 +05:30 |
|
Nabin Hait
|
be0b090d27
|
voucher date removal issue fixed
|
2012-03-01 17:31:51 +05:30 |
|
Nabin Hait
|
6d517ff005
|
form cleanup: fixed callback issues
|
2012-03-01 10:57:23 +05:30 |
|
Nabin Hait
|
177ca8dbbd
|
Description changed
|
2012-03-01 10:54:34 +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
|
0959341130
|
Form Cleanup: Dynamic label change, smart hide/unhide and dependencies
|
2012-02-27 12:47:40 +05:30 |
|
Rushabh Mehta
|
2886b95da0
|
added todo
|
2012-02-24 11:26:31 +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
|
c5471ddb8d
|
added setup and removed multi-col layout in body
|
2012-02-22 12:07:42 +05:30 |
|
Rushabh Mehta
|
35fabf76a6
|
updated module pages
|
2012-02-21 19:03:50 +05:30 |
|
Rushabh Mehta
|
085617ed12
|
merge latest
|
2012-02-21 17:31:04 +05:30 |
|
Rushabh Mehta
|
d025133b39
|
added module pages and other css updates
|
2012-02-21 17:26:50 +05:30 |
|
Nabin Hait
|
8e9b578c00
|
expected delivery date can be equal to po date, not before po date
|
2012-02-21 13:35:28 +05:30 |
|
Rushabh Mehta
|
09a897afe4
|
added selling-home
|
2012-02-20 18:30:52 +05:30 |
|
Nabin Hait
|
ab90ee04f5
|
callback issues and item default get most priority
|
2012-02-15 14:28:02 +05:30 |
|
Anand Doshi
|
ce0c65f173
|
Merge branch 'stable' into latest
|
2012-02-13 18:01:23 +05:30 |
|
Rushabh Mehta
|
f17ce7bc67
|
added whitelist check
|
2012-02-13 16:50:52 +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
|
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
|
a629fa3f05
|
Merge branch 'stable' into latest
|
2012-02-07 18:02:42 +05:30 |
|
Anand Doshi
|
02035d071a
|
Fix in import docs containing utf-8 encoding
|
2012-02-07 17:57:40 +05:30 |
|
Anand Doshi
|
b65363aa46
|
Merge branch 'stable' into latest
|
2012-02-07 14:28:29 +05:30 |
|
Anand Doshi
|
188a499f45
|
Fix in default customer group fetch while converting lead to customer
|
2012-02-07 14:28:05 +05:30 |
|
Anand Doshi
|
67d2c8396c
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-02-07 10:59:29 +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 |
|
Rushabh Mehta
|
e651648b1b
|
added missing icons
|
2012-02-06 16:28:06 +05:30 |
|
Anand Doshi
|
0c9cde9f62
|
Merge branch 'stable' into latest
Conflicts:
version.num
|
2012-02-02 12:43:39 +05:30 |
|
Anand Doshi
|
354dd9b35a
|
Allow changing export_rate if discount=0, then calculate discount based on ref_rate and export_rate (valid for non inclusive pricing)
|
2012-02-02 12:42:14 +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
|
6c95ccb8f5
|
Net total calculation fix
|
2012-01-30 14:28:31 +05:30 |
|
Rushabh Mehta
|
d6840b202a
|
added products + cleanups
|
2012-01-30 14:00:46 +05:30 |
|
Rushabh Mehta
|
3a751e8f82
|
added blog subscriber, unsubscribe
|
2012-01-27 18:00:14 +05:30 |
|
Anand Doshi
|
74d1b65105
|
changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch
|
2012-01-27 12:25:09 +05:30 |
|
Anand Doshi
|
9a7ea9285e
|
Customer Address Contact report
|
2012-01-23 18:32:20 +05:30 |
|
Anand Doshi
|
a170418ed0
|
Fixes in floating point issues
|
2012-01-23 14:09:06 +05:30 |
|
Anand Doshi
|
da68ce8b84
|
Fix to other charges total
|
2012-01-20 15:02:41 +05:30 |
|
Anand Doshi
|
60c42d2e1c
|
Fix to other charges total
|
2012-01-20 14:44:14 +05:30 |
|
Anand Doshi
|
4c92390972
|
Fix to other charges total
|
2012-01-20 14:32:01 +05:30 |
|
Anand Doshi
|
10393b39d3
|
Other Charges total fixed to 2 decimals
|
2012-01-20 14:29:40 +05:30 |
|
Anand Doshi
|
ff54778418
|
Fix in sales_common
|
2012-01-20 13:20:21 +05:30 |
|
Anand Doshi
|
edb45c6ce5
|
Purchase Rcpt in Feed, Grand Total fixed to 2 decimals in sales_common.js
|
2012-01-19 17:12:17 +05:30 |
|
Anand Doshi
|
dc914276a9
|
Merge branch 'master' into latest
|
2012-01-16 17:39:33 +05:30 |
|
Anand Doshi
|
d487f782a4
|
Fix: change module name from material_management to stock in an import in installation_note
|
2012-01-16 17:38:19 +05:30 |
|
Anand Doshi
|
077416300e
|
Fix: floating point issue on submission of RV and creation of GL Entry
|
2012-01-16 16:02:47 +05:30 |
|
Anand Doshi
|
90f6e55c29
|
Changes in Inclusive Rate Taxes precision
|
2012-01-16 14:13:39 +05:30 |
|
Anand Doshi
|
610f9728ab
|
Removing ref_rate back calculation as it injects floating point issue
|
2012-01-13 17:43:22 +05:30 |
|
Anand Doshi
|
4badeecf36
|
Reverting toFixed issue for grand total
|
2012-01-13 15:45:58 +05:30 |
|
Anand Doshi
|
560883145c
|
Fix to floating point issue in grand total
|
2012-01-13 14:35:42 +05:30 |
|
Anand Doshi
|
265f3edb8f
|
On clicking Get Charges, also pull the field included_in_print_rate
|
2012-01-12 14:56:26 +05:30 |
|
Anand Doshi
|
58574acfbc
|
Fix: Bug in Actual Tax Rate due to inclusive rate
|
2012-01-11 13:39:06 +05:30 |
|
Anand Doshi
|
35041607be
|
Fix: when ref_rate is 0 and basic_rate is > 0, calc ref_rate
|
2012-01-11 11:21:58 +05:30 |
|
Anand Doshi
|
3a82dfd171
|
Rename Indent to Purchase Requisition
|
2012-01-10 16:56:11 +05:30 |
|
Anand Doshi
|
95c9d30cfd
|
Removed unnecessary console logs
|
2012-01-10 11:52:43 +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 |
|
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 |
|
Anand Doshi
|
d56d57d205
|
Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login
|
2012-01-02 16:25:05 +05:30 |
|
Nabin Hait
|
d0a892ffe7
|
print hide price list flds
|
2011-12-22 19:04:49 +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 |
|
Nabin Hait
|
a57732f71d
|
Removed custom field from doctype
|
2011-12-20 18:48:19 +05:30 |
|
Nijil Y
|
8dd861bda5
|
Auto Indent creation when stock reaches re-order level
|
2011-12-20 17:17:51 +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 |
|
Anand Doshi
|
5245e6547b
|
Change path of images in accounts browser and sales browser
|
2011-12-12 19:18:23 +05:30 |
|
Anand Doshi
|
bf41aef7f0
|
Merge pull request #144 from anandpdoshi/master
Changes in spartan print formats to show border in chrome
|
2011-11-16 01:20:33 -08:00 |
|
Anand Doshi
|
19a2767b77
|
Changes in spartan print formats to show border in chrome
|
2011-11-16 14:49:37 +05:30 |
|
Nabin Hait
|
7b095e97ad
|
Update erpnext/selling/doctype/quotation/quotation.py
|
2011-11-16 14:25:36 +05:30 |
|
Nabin Hait
|
efc2c327cf
|
Update erpnext/selling/doctype/quotation/quotation.py
|
2011-11-16 14:24:31 +05:30 |
|
Nabin Hait
|
4faf99424a
|
Modified validation for duplicate item
|
2011-11-16 14:20:45 +05:30 |
|
Nabin Hait
|
65a053abe6
|
Modified validation for duplicate item
|
2011-11-16 14:19:26 +05:30 |
|
Anand Doshi
|
e3559853bd
|
Added new Print Formats as part of repository
|
2011-11-16 13:18:45 +05:30 |
|
Nabin Hait
|
685564f71d
|
Resolved conflict after merging with master
|
2011-10-11 14:42:34 +05:30 |
|
Nabin Hait
|
61985ac5fa
|
get_query modified for item in quotation
|
2011-09-30 17:46:08 +05:30 |
|
Nabin Hait
|
73c4a4a154
|
removed make_feed() function
|
2011-09-16 11:24:54 +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
|
66ac2b018a
|
first cut for lazy loading framework
|
2011-09-05 18:43:09 +05:30 |
|