Nabin Hait
|
fe93ea56b6
|
Minor fixes: escaped characters
|
2015-01-19 11:07:32 +05:30 |
|
Rushabh Mehta
|
0335005eea
|
[minor] added allow rename
|
2015-01-15 15:29:22 +05:30 |
|
Nabin Hait
|
fff3ab752c
|
Fixed conflict
|
2015-01-14 16:27:13 +05:30 |
|
Nabin Hait
|
4e7cc93af9
|
minor fix in reposting utility
|
2015-01-12 10:55:48 +05:30 |
|
Rushabh Mehta
|
e1cb0ae738
|
[design] list views
|
2015-01-05 17:39:05 +05:30 |
|
Rushabh Mehta
|
419ae33c3e
|
[merge] v5-design
|
2014-12-31 15:03:14 +05:30 |
|
Nabin Hait
|
dd38a266b8
|
Removed tname and fname from code
|
2014-12-26 13:15:21 +05:30 |
|
Rushabh Mehta
|
a5b149c061
|
[design] module pages, messages, timelines
|
2014-12-26 12:53:02 +05:30 |
|
Nabin Hait
|
e7d153624f
|
Table Field Renaming: code replace, JV and budget distribution renamed
|
2014-12-25 16:01:55 +05:30 |
|
Rushabh Mehta
|
9f32a50379
|
[merge] fix
|
2014-12-03 12:35:19 +05:30 |
|
Nabin Hait
|
eca7e22cda
|
Shopping cart test fixed
|
2014-12-02 11:35:29 +05:30 |
|
Rushabh Mehta
|
6d950d23a8
|
[merge]
|
2014-11-28 12:08:51 +05:30 |
|
Rushabh Mehta
|
bd9b62ff28
|
[rename] Support Ticket -> Issue
|
2014-11-28 11:46:10 +05:30 |
|
Nabin Hait
|
249bbbc56f
|
fixes during testing version 5
|
2014-11-26 15:35:39 +05:30 |
|
Rushabh Mehta
|
2f4567fa3c
|
[minor] [ux] address refresh for lead
|
2014-11-24 15:18:40 +05:30 |
|
Rushabh Mehta
|
5eeef7f065
|
[refactor] address and contact list in customer, supplier, lead, sales person
|
2014-11-24 14:16:51 +05:30 |
|
Rushabh Mehta
|
7d36875d6f
|
[refactor] address and contact list in customer, supplier, lead, sales person
|
2014-11-24 14:16:47 +05:30 |
|
Nabin Hait
|
ae1dcabcb5
|
Fixed merge conflict
|
2014-11-05 12:41:02 +05:30 |
|
Nabin Hait
|
4acd431b92
|
Requested qty calculation logic
|
2014-11-04 15:34:03 +05:30 |
|
Nabin Hait
|
10b155a486
|
cost center based on project
|
2014-10-23 13:18:59 +05:30 |
|
Rushabh Mehta
|
be1a8d82c5
|
[merge] develop
|
2014-10-21 13:14:55 +05:30 |
|
Nabin Hait
|
fc2dd44694
|
Partial payment reconciliation. Fixes #1982
|
2014-10-17 14:57:20 +05:30 |
|
Nabin Hait
|
2348a5f592
|
repost stock utility
|
2014-10-15 15:31:33 +05:30 |
|
Nabin Hait
|
f1a07ff105
|
Allow zero rate while reposting
|
2014-10-15 12:23:35 +05:30 |
|
Nabin Hait
|
8a28ccfa2f
|
Repost gl entries where mismatch with stock balance
|
2014-10-14 11:41:56 +05:30 |
|
Nabin Hait
|
7c6f990cf9
|
Minor fix for moving average
|
2014-10-10 18:03:27 +05:30 |
|
Nabin Hait
|
4d74216147
|
Maintain negative stock balance if balance qty is negative
|
2014-10-09 19:25:19 +05:30 |
|
Nabin Hait
|
e96e83d557
|
stock reco and repost vouchers
|
2014-10-08 18:06:14 +05:30 |
|
Nabin Hait
|
6c48ef781b
|
Utility: Repost stock ledger entries and gl entries for all stock transactions
|
2014-10-08 11:02:18 +05:30 |
|
Nabin Hait
|
9ddc002d6a
|
country wise chart of accounts restructured
|
2014-10-06 13:01:58 +05:30 |
|
Nabin Hait
|
c68646c694
|
[merge] 4.x to 5.0
|
2014-10-06 12:57:48 +05:30 |
|
Rushabh Mehta
|
e10cf021d9
|
[email] remove communicationlist #561
|
2014-09-16 15:12:18 +05:30 |
|
Rushabh Mehta
|
ce00772ac0
|
[cleanup] removed communication js, fields
|
2014-09-16 15:11:42 +05:30 |
|
Rushabh Mehta
|
c0bb453b88
|
[refactor] [frappe 5.0]
|
2014-09-16 15:10:54 +05:30 |
|
Anand Doshi
|
30c5b41398
|
[minor] removed Suggest
|
2014-09-15 16:43:34 +05:30 |
|
Nabin Hait
|
65bef02607
|
Fixes in address template
|
2014-09-15 12:18:28 +05:30 |
|
Nabin Hait
|
7f3f2a0f0a
|
Fixes in repost_stock utility
|
2014-09-01 18:16:24 +05:30 |
|
Anand Doshi
|
580f447bbd
|
Merge pull request #2100 from rmehta/aug-22
[cleanup] remove allow_attach
|
2014-08-25 16:07:50 +05:30 |
|
Nabin Hait
|
06927a20b2
|
Update repost_stock.py
|
2014-08-25 14:08:54 +05:30 |
|
Rushabh Mehta
|
7a6ab91080
|
remove set_title_left
|
2014-08-25 13:04:22 +05:30 |
|
Rushabh Mehta
|
e8dd4160d4
|
[cleanup] remove allow_attach
|
2014-08-25 13:04:21 +05:30 |
|
Anand Doshi
|
62aa8fa4e7
|
[minor] Removed 'PIN: ' from default Address Template
|
2014-08-18 12:53:37 +05:30 |
|
nabinhait
|
f807cda375
|
PR and PI gl entries fixes for landed cost
|
2014-08-11 16:12:31 +05:30 |
|
Rushabh Mehta
|
139ec2a64f
|
Update note_list.html
|
2014-08-08 15:47:56 +05:30 |
|
Anand Doshi
|
4cc94df752
|
[tests] Fixed Test Records
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
7a4e739d6c
|
templating for hr
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
8544447b19
|
added more listview templates
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
18eb4f5015
|
added listviews for sales, purchase
|
2014-08-08 11:56:31 +05:30 |
|
Anand Doshi
|
62b1cbf003
|
[impact] Limit available functions in jinja environment
|
2014-07-25 13:02:29 +05:30 |
|
Rushabh Mehta
|
f84c240d1c
|
cleanup for print format
|
2014-07-25 13:01:52 +05:30 |
|
nabinhait
|
7700c62fa8
|
Minor fix
|
2014-07-14 14:21:21 +05:30 |
|
nabinhait
|
b0a8d000b1
|
Utility: reset serial no status and warehouse
|
2014-07-14 11:56:03 +05:30 |
|
nabinhait
|
5c38488590
|
Utility: reset serial no status and warehouse
|
2014-07-14 11:44:42 +05:30 |
|
nabinhait
|
7e848b1924
|
Title mandatory in Note. Fixes #1913
|
2014-07-09 12:54:56 +05:30 |
|
Anand Doshi
|
cd0aed993a
|
Fixed Address Template Patch
|
2014-06-06 17:37:31 +05:30 |
|
Anand Doshi
|
fc601659f5
|
Fixed Address Template
|
2014-06-06 17:07:50 +05:30 |
|
Anand Doshi
|
2ec93590e4
|
Minor fix in address template
|
2014-06-06 11:45:30 +05:30 |
|
Rushabh Mehta
|
ba83e9cfbe
|
removed sms control and related cleanup, fixes frappe/erpnext#462
|
2014-06-05 17:56:42 +05:30 |
|
Rushabh Mehta
|
5036706f81
|
removed address_title from address and removed test
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
c02fbd22fa
|
removed address_title from address and removed test
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
33020a63b8
|
patch for address template fixes #1749
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
eaa2e55d20
|
patch for address template fixes #1749
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
c22e11d483
|
added address template:
|
2014-06-05 16:01:55 +05:30 |
|
Anand Doshi
|
85479bcbc0
|
Fixes for apply user permissions and momentjs
|
2014-06-04 18:15:43 +05:30 |
|
Anand Doshi
|
a8ce570635
|
Permission relogication continued
|
2014-06-04 17:48:53 +05:30 |
|
Anand Doshi
|
fab0904af7
|
Started permission relogication
|
2014-06-04 17:48:52 +05:30 |
|
Nabin Hait
|
62ec60188b
|
use build_filter_conditions from db_query. Fixes #1679
|
2014-05-30 11:22:10 +05:30 |
|
Rushabh Mehta
|
92ce693e6f
|
added ignore_permission in Lead for creating Event
|
2014-05-21 14:59:56 +05:30 |
|
Anand Doshi
|
78e9c6ef70
|
Deprecate Select fields with options as link:
|
2014-05-09 13:36:13 +05:30 |
|
Anand Doshi
|
f410bd9bf9
|
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
|
2014-05-07 17:20:42 +05:30 |
|
Nabin Hait
|
3fcec56f7b
|
Bulk rename tool fixes #1594
|
2014-05-06 19:13:46 +05:30 |
|
Anand Doshi
|
2b0e4266cf
|
Go to home page on clicking left arrow in note list
|
2014-05-02 19:43:11 +05:30 |
|
Anand Doshi
|
07339fc69e
|
Fixes in Setup Wizard and Attachments
|
2014-04-22 15:30:24 +05:30 |
|
Rushabh Mehta
|
370a024e46
|
cleaned up sample website and separated fixtures by country
|
2014-04-18 16:00:41 +05:30 |
|
Anand Doshi
|
ac32bad25a
|
Fixes in Taxes, Quotation and Address Territory
|
2014-04-18 01:32:02 +05:30 |
|
Nabin Hait
|
6298536e46
|
set stock balance as per serial no count
Cherry Picked and Modified by @anandpdoshi
Conflicts:
stock/doctype/stock_ledger/stock_ledger.py
utilities/repost_stock.py
|
2014-04-16 15:23:08 +05:30 |
|
Rushabh Mehta
|
2c45899a02
|
fixed strings for translation
|
2014-04-15 14:41:56 +05:30 |
|
Pratik Vyas
|
b52618c142
|
frappe._ to __
|
2014-04-14 16:25:30 +05:30 |
|
Rushabh Mehta
|
558a9aabfb
|
removed control panel
|
2014-04-04 12:00:36 +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
|
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
|
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 |
|
Nabin Hait
|
4d713ac5ba
|
sql injection fixes
|
2014-03-21 11:22:37 +05:30 |
|
Rushabh Mehta
|
7c932003ed
|
rename Profile to User frappe/frappe#470
|
2014-03-11 16:15:59 +05:30 |
|
Anand Doshi
|
e9baaa68e7
|
Changed frappe.conn to frappe.db
|
2014-02-26 12:35:33 +05:30 |
|
Nabin Hait
|
a1c96de9fc
|
party related cleanup
|
2014-02-21 14:45:10 +05:30 |
|
Nabin Hait
|
9d1f077922
|
get lead details in quotation
|
2014-02-19 17:43:24 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
a7f757a3f4
|
Rename fields: initial commit
|
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
|
574c7e7c63
|
item related cleanup
|
2014-02-06 15:51:01 +05:30 |
|
Rushabh Mehta
|
347889b233
|
merge
|
2014-02-03 14:49:53 +05:30 |
|
Rushabh Mehta
|
9adcf85a14
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-02-03 10:44:34 +05:30 |
|
Nabin Hait
|
b5be7bab9b
|
Stock Return: fetch customer and supplier details
|
2014-01-30 18:47:12 +05:30 |
|
Akhilesh Darjee
|
e0a1039756
|
merge conflict fixed
|
2014-01-30 14:44:35 +05:30 |
|
Akhilesh Darjee
|
4cdb79941b
|
map charge to taxes and charges in transactions
|
2014-01-30 13:56:57 +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
|
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 |
|
Rushabh Mehta
|
3b432dce88
|
added listviews
|
2014-01-28 16:10:15 +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 |
|
Rushabh Mehta
|
1230e3a28b
|
don't hide customer / supplier links, webnotes/erpenxt#796
|
2014-01-27 11:02:27 +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
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +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 |
|
Rushabh Mehta
|
61bf425935
|
deleted moves
|
2013-12-27 17:58:39 +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
|
2b08985e16
|
Translations redesigned webnotes/wnframework#351
|
2013-12-19 18:27:48 +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
|
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
|
473f7d6314
|
removed signin.erpnext.com
|
2012-09-24 10:05:14 +05:30 |
|
Nabin Hait
|
214d62a09a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-18 11:19:59 +05:30 |
|
Nabin Hait
|
82efcc780b
|
reset standard transaction series in cleanup_data
|
2012-09-18 11:19:34 +05:30 |
|
Rushabh Mehta
|
4156523175
|
added flot for graphs in report_grid
|
2012-09-17 19:10:36 +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 |
|
Rushabh Mehta
|
62aa086e80
|
todo: assignment notification fix
|
2012-09-07 10:05:13 +05:30 |
|
Rushabh Mehta
|
38cc3d6534
|
todo: do not send message to if assigned to self
|
2012-09-07 09:54:19 +05:30 |
|
Anand Doshi
|
8456eabed8
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-09 12:17:44 +05:30 |
|
Anand Doshi
|
c6cf4a2630
|
do not display mouse as a clickable pointer when hovering on description in todo list
|
2012-08-09 12:16:03 +05:30 |
|
Rushabh Mehta
|
899fe5d3f0
|
links enabled in todo
|
2012-08-08 15:30:19 +05:30 |
|
Rushabh Mehta
|
17588987a4
|
file upload should not be decoded
|
2012-08-08 10:37:02 +05:30 |
|
Rushabh Mehta
|
bf8cac53c7
|
pre, code style fix
|
2012-08-08 10:05:51 +05:30 |
|
Rushabh Mehta
|
586c6f3cbe
|
calendar: links to ref document
|
2012-08-07 16:36:40 +05:30 |
|
Rushabh Mehta
|
c2ef064ebb
|
todo page background bugfix
|
2012-08-07 16:36:10 +05:30 |
|
Anand Doshi
|
e81c07ff4d
|
appended unicode literals import after merge
|
2012-08-07 15:08:52 +05:30 |
|
Anand Doshi
|
16ad50f641
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/stock/doctype/item/item.txt
|
2012-08-07 15:07:56 +05:30 |
|
Rushabh Mehta
|
6252c13ec8
|
added code style and mardown in todo
|
2012-08-07 12:53:49 +05:30 |
|