Rushabh Mehta
|
9f0d625300
|
update translation strings #1403
|
2014-04-14 19:20:45 +05:30 |
|
Pratik Vyas
|
b0f279a34e
|
js translations refactor
|
2014-04-14 17:14:23 +05:30 |
|
Pratik Vyas
|
b52618c142
|
frappe._ to __
|
2014-04-14 16:25:30 +05:30 |
|
Anand Doshi
|
bd67e87921
|
Fixes saving of Sales Order and fetching Prices frappe/frappe#478
|
2014-04-11 16:51:27 +05:30 |
|
Anand Doshi
|
13ae548ff6
|
Fixes for model-cleanup frappe/frappe#478
|
2014-04-10 18:43:07 +05:30 |
|
Pratik Vyas
|
f7daab7393
|
pass only valid columns to get_item_details
|
2014-04-10 17:53:30 +05:30 |
|
Anand Doshi
|
233fbb08b2
|
Minor fix
|
2014-04-10 12:53:16 +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
|
cd71e1d8ab
|
Test Cases - Journal Voucher, Purchase Invoice, Period Closing Voucher frappe/frappe#478
|
2014-04-08 13:53:35 +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
|
4155e58a61
|
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
|
2014-04-07 16:00:49 +05:30 |
|
Nabin Hait
|
088dec6c09
|
testcase fixes #478
|
2014-04-07 16:00:28 +05:30 |
|
Rushabh Mehta
|
322d39f3a6
|
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
|
2014-04-07 15:09:25 +05:30 |
|
Rushabh Mehta
|
49f49ea603
|
started party frappe/erpnext#1503
|
2014-04-07 15:09:09 +05:30 |
|
Nabin Hait
|
dc82d4f0cd
|
frappe/frappe#478 fixes
|
2014-04-07 12:02:57 +05:30 |
|
Nabin Hait
|
9f66c306ea
|
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
|
2014-04-07 12:01:59 +05:30 |
|
Anand Doshi
|
bedc62f090
|
Fixed Feed
|
2014-04-04 16:26:45 +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 |
|
Rushabh Mehta
|
c10213d861
|
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
|
2014-04-03 17:43:28 +05:30 |
|
Rushabh Mehta
|
0cf531c8a6
|
frappe/frappe#478 fixes
|
2014-04-03 17:43:06 +05:30 |
|
Nabin Hait
|
c272f2020b
|
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
|
2014-04-03 17:39:50 +05:30 |
|
Nabin Hait
|
365ae27acf
|
frappe/frappe#478 fixes
|
2014-04-03 17:38:54 +05:30 |
|
Rushabh Mehta
|
7db7112d3f
|
frappe/frappe#478 fix and added print heading
|
2014-04-03 15:04:18 +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
|
63dfe3d3b3
|
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
|
2014-04-02 15:03:51 +05:30 |
|
Anand Doshi
|
5b552b51f1
|
frappe/frappe#478
|
2014-04-02 15:03:35 +05:30 |
|
Rushabh Mehta
|
732825cb23
|
frappe/frappe#478 fixed todo and renamed hooks
|
2014-04-02 12:08:03 +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
|
43405203b2
|
frappe/frappe#478
|
2014-03-28 16:43:50 +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
|
67d6a4e3aa
|
Merge remote-tracking branch 'frappe/develop' into model-cleanup
Conflicts:
erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/controllers/stock_controller.py
|
2014-03-28 13:41:59 +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 |
|
Nabin Hait
|
4090c78c3f
|
coa: payment to invoice matching tool fixes
|
2014-03-27 17:19:32 +05:30 |
|
Nabin Hait
|
becf75d791
|
Perpetual inventory cleanup
|
2014-03-27 17:18:29 +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
|
5c6b34a84c
|
minor fix
|
2014-03-26 10:30:25 +05:30 |
|
Nabin Hait
|
3a70ba3ba1
|
Merge github.com:frappe/erpnext into develop
|
2014-03-26 10:23:53 +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
|
1d630ccaa5
|
Update serial no maintenance status based on warranty/amc expiry date
|
2014-03-26 10:23:14 +05:30 |
|
Anand Doshi
|
754cbd4036
|
Fixed Permissions and Time Log
|
2014-03-25 20:09:12 +05:30 |
|
Nabin Hait
|
6fa0f25e7c
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-03-25 19:36:16 +05:30 |
|
Nabin Hait
|
0c9d42258c
|
Minor fix related to pos paid amount
|
2014-03-25 19:35:41 +05:30 |
|
Anand Doshi
|
79196a9ef7
|
Fixed install
|
2014-03-25 19:32:08 +05:30 |
|
Nabin Hait
|
2c517e0a62
|
Fixes related to countrywise coa
|
2014-03-25 18:28:49 +05:30 |
|
Nabin Hait
|
ec9fb67d84
|
fixed conflict
|
2014-03-25 16:53:50 +05:30 |
|
Anand Doshi
|
7fbdba02ab
|
Fixed Countrywise Chart of Accounts patch
|
2014-03-25 13:50:52 +05:30 |
|
Nabin Hait
|
221a8fff1c
|
minor fix in patch
|
2014-03-23 17:35:24 +05:30 |
|
Nabin Hait
|
96c0afe0f1
|
minor fix in patch
|
2014-03-23 17:25:02 +05:30 |
|
Nabin Hait
|
06a595090d
|
coa: minor fix
|
2014-03-21 18:30:46 +05:30 |
|
Nabin Hait
|
425bfc5c8d
|
minor fix in serial no
|
2014-03-21 18:15:26 +05:30 |
|
Nabin Hait
|
155c96b410
|
patch to delete mis control and financial statements and set bank/cash account
|
2014-03-21 12:15:13 +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
|
b5e6d7e171
|
Account balance in debit and credit columns in trial balance and financial analytics report
|
2014-03-21 11:26:09 +05:30 |
|
Nabin Hait
|
47a3c10334
|
Patch to update old accounts property
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
e67202484d
|
Imported charts with proper report types
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
e0f98d7202
|
account properties file added
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
102842ba79
|
Leave allocation fix
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
73083dc960
|
Fix related to user_default
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
27bb7892b3
|
Fixes in pos settings
|
2014-03-21 11:26:07 +05:30 |
|
Nabin Hait
|
482ffac83f
|
Set paid amount to zero if not pos
|
2014-03-21 11:26:07 +05:30 |
|
Nabin Hait
|
439dceebd8
|
minor fix in landed cost wizard
|
2014-03-21 11:25:17 +05:30 |
|
Nabin Hait
|
e848914da1
|
consider all entries against bank account in bank reconciliation statement, even if no reference no
|
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
|
e71cf6d6a1
|
More country charts imported from openerp
|
2014-03-21 11:25:17 +05:30 |
|
Nabin Hait
|
037bf6b382
|
More country charts imported from openerp
|
2014-03-21 11:25:17 +05:30 |
|
Nabin Hait
|
24e136e3f3
|
Patch: set root_type for old existing accounts
|
2014-03-21 11:25:16 +05:30 |
|
Nabin Hait
|
3dfe854108
|
Rename duplicate account
|
2014-03-21 11:25:16 +05:30 |
|
Nabin Hait
|
fc37fd8b6e
|
Set Paid amount and write off amount for pos
|
2014-03-21 11:25:16 +05:30 |
|
Nabin Hait
|
55a03dbf69
|
major fixes in importing charts from openerp
|
2014-03-21 11:22:42 +05:30 |
|
Nabin Hait
|
b93ebaebe4
|
Added new account types and patch for existing
|
2014-03-21 11:22:41 +05:30 |
|
Nabin Hait
|
a18bf07920
|
updated charts json with proper account and root types
|
2014-03-21 11:22:41 +05:30 |
|
Nabin Hait
|
d7d9d25d71
|
Country and chart fields added in company master
|
2014-03-21 11:22:40 +05:30 |
|
Nabin Hait
|
813a93d78d
|
import chart records into database frm json
|
2014-03-21 11:22:40 +05:30 |
|
Nabin Hait
|
a69c30edec
|
country code added
|
2014-03-21 11:22:39 +05:30 |
|
Nabin Hait
|
d89f3403ac
|
charts of account doctype added and imported charts json from openerp
|
2014-03-21 11:22:39 +05:30 |
|
Nabin Hait
|
b77773ca07
|
fixes in financial statements
|
2014-03-21 11:22:38 +05:30 |
|
Nabin Hait
|
2b57ecbd6c
|
fixes for debit_or_credit in account tree grid report
|
2014-03-21 11:22:38 +05:30 |
|
Nabin Hait
|
53822ae9d0
|
Account balance must be of type debit/credit
|
2014-03-21 11:22:38 +05:30 |
|
Nabin Hait
|
49a6f0754e
|
Removed debit_or_credit field
|
2014-03-21 11:22:38 +05:30 |
|
Nabin Hait
|
133490a0c5
|
Removed max roots validation
|
2014-03-21 11:22:37 +05:30 |
|
Nabin Hait
|
4d713ac5ba
|
sql injection fixes
|
2014-03-21 11:22:37 +05:30 |
|
Anand Doshi
|
eb7fea673b
|
Fixed set_single_defaults during install
|
2014-03-19 17:10:01 +05:30 |
|
Anand Doshi
|
4b2692182a
|
Fixes after change in fields handling in Document
|
2014-03-19 16:58:42 +05:30 |
|
Anand Doshi
|
76f330ca66
|
Fixed Fiscal Year input issue in Setup Wizard
|
2014-03-19 15:45:05 +05:30 |
|
Anand Doshi
|
2134d24b36
|
Removed cloud subscription logic
|
2014-03-14 15:24:57 +05:30 |
|
Anand Doshi
|
49e0a687b3
|
Minor Fixes
|
2014-03-13 20:44:28 +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 |
|
Pratik Vyas
|
65e8676f8b
|
Profile -> User
|
2014-03-13 03:09:15 +05:30 |
|
Pratik Vyas
|
5c81f9c44e
|
check docstatus before updating employee
|
2014-03-13 02:35:23 +05:30 |
|
Rushabh Mehta
|
7c932003ed
|
rename Profile to User frappe/frappe#470
|
2014-03-11 16:15:59 +05:30 |
|
Anand Doshi
|
c379c78fec
|
Fixed Dropbox, Scheduler, 3to4 migration
|
2014-03-11 15:17:13 +05:30 |
|
Anand Doshi
|
09a9f4c0c9
|
Added module to Report doctype
|
2014-03-07 17:20:22 +05:30 |
|
Rushabh Mehta
|
c12ccdb6ea
|
bugfix erpnext/frappe#1446
|
2014-03-06 15:45:45 +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
|
2e7ad8980c
|
fix for queries
|
2014-03-06 12:28:47 +05:30 |
|
Rushabh Mehta
|
4541875c81
|
removed searchfield condition from get_match_cond frappe/erpnext#1457
|
2014-03-06 11:19:46 +05:30 |
|
Rushabh Mehta
|
0fabc6a841
|
minor fix
|
2014-03-06 11:19:46 +05:30 |
|
Anand Doshi
|
2d5727b17b
|
Ignore mandatory during email pulling
|
2014-03-05 19:24:07 +05:30 |
|
Anand Doshi
|
b2c2fca8a5
|
Added Pricing Rule to Accounts, Buying, Selling home
|
2014-03-05 18:25:10 +05:30 |
|
Nabin Hait
|
9472247b6e
|
Update stock_entry.js
|
2014-03-05 17:45:58 +05:30 |
|
Anand Doshi
|
ebdac5db5c
|
Fix in Pricing Rule Patch
|
2014-03-05 17:31:37 +05:30 |
|
Anand Doshi
|
7ea8528d50
|
Fixed Pricing Rule Cleanup Fieldname
|
2014-03-05 17:27:00 +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 |
|
Nabin Hait
|
2d57b0aa52
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-03-05 10:51:04 +05:30 |
|
Anand Doshi
|
0c4ef64b32
|
Fixed booboo: Moved website moduleview to framework
|
2014-03-04 11:15:08 +05:30 |
|
Anand Doshi
|
e30511d315
|
Email Settings split into Outgoing Email Settings and Support Email Settings
|
2014-03-03 20:32:20 +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
|
6b12b07b33
|
Fixes to Module Views
|
2014-03-03 16:05:00 +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
|
f976143063
|
pricing rule patch fix
|
2014-02-28 19:02:27 +05:30 |
|
Nabin Hait
|
177b86a15b
|
fix in pricing rule
|
2014-02-28 15:47:22 +05:30 |
|
Nabin Hait
|
e7e615cf18
|
pricing rule: fixes in testcase
|
2014-02-28 15:21:49 +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
|
8462a7691b
|
Fixed login
|
2014-02-28 11:53:59 +05:30 |
|
Rushabh Mehta
|
063141d152
|
added patch for address
|
2014-02-28 11:37:36 +05:30 |
|
Anand Doshi
|
fb21ce3893
|
3to4 fixes
|
2014-02-27 13:18:20 +05:30 |
|