Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,679 Commits 3 Branches 0 Tags 1 GiB
6777efa7fa
Commit Graph

2615 Commits

Author SHA1 Message Date
Rushabh Mehta
c38fc713c6 updated translations 2014-04-16 17:46:30 +05:30
Rushabh Mehta
8c51318d82 added naming series for campaign #1413 2014-04-16 17:41:52 +05:30
Rushabh Mehta
e8b0402a10 added naming series for campaign #1413 2014-04-16 17:41:52 +05:30
Rushabh Mehta
c635875765 added naming series for campaign #1413 2014-04-16 17:41:51 +05:30
Anand Doshi
652bc0784a Ported v3 fixes to v4 
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
 2014-04-16 15:26:42 +05:30
Nabin Hait
13429a3b34 Space allowed in naming series 
Conflicts:
	setup/doctype/naming_series/naming_series.py
 2014-04-16 15:24:04 +05:30
Nabin Hait
a0c239db8d perpetual inventory fix related to sub-contracting 
Cherry-picked and modified by @anandpdoshi

Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	controllers/buying_controller.py
	controllers/stock_controller.py
 2014-04-16 15:23:10 +05:30
Nabin Hait
450d9d72d7 Minor fix in monthly attendance report 
Cherry-picked and modified by @anandpdoshi

Conflicts:
	hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
 2014-04-16 15:23:09 +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
Anand Doshi
88a869f34d No Copy for Paid and Write Off Amount in Sales Invoice 
Ported webnotes/erpnext@f739bffedd
 2014-04-16 15:23:08 +05:30
Rushabh Mehta
1d8f1a9a46 #1481 2014-04-16 09:32:51 +05:30
Rushabh Mehta
82d8a637ac #1252 2014-04-16 09:20:00 +05:30
Rushabh Mehta
d85dc868ca more message fixes for translation 2014-04-15 22:54:34 +05:30
Rushabh Mehta
ff93802d58 more message fixes 2014-04-15 18:40:31 +05:30
Anand Doshi
a6e2ca9d3b Fixes #1491 2014-04-15 17:12:15 +05:30
Rushabh Mehta
8a40c136ce more message fixing 2014-04-15 16:31:20 +05:30
Anand Doshi
c5e057f676 Fixed exploded BOM construction 2014-04-15 16:14:15 +05:30
Rushabh Mehta
2c45899a02 fixed strings for translation 2014-04-15 14:41:56 +05:30
Anand Doshi
5d4ffa6cf8 Fixed splash.svg 2014-04-15 13:09:09 +05:30
Pratik Vyas
f37d6fe32b Merge pull request #1514 from frappe/js-translate-refactor 
JS translation refactor
 2014-04-15 11:44:16 +05:30
Pratik Vyas
e1eeb22f1e remove linebreaks for translation strings (js) 2014-04-15 10:50:36 +05:30
Pratik Vyas
13c92e3ad5 fix accounts browser and cost center strings (js) 2014-04-15 10:08:53 +05:30
Pratik Vyas
ec9c448ccf fix taxes and charges strings and labels 2014-04-15 09:49:40 +05:30
Rushabh Mehta
549977bf4f typo fix in journal_voucher.py 2014-04-14 22:40:17 +05:30
Rushabh Mehta
354b32177d fix for leave application test 2014-04-14 22:23:41 +05:30
Rushabh Mehta
9f0d625300 update translation strings #1403 2014-04-14 19:20:45 +05:30
Pratik Vyas
b0f279a34e js translations refactor 2014-04-14 17:14:23 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Anand Doshi
bd67e87921 Fixes saving of Sales Order and fetching Prices frappe/frappe#478 2014-04-11 16:51:27 +05:30
Anand Doshi
13ae548ff6 Fixes for model-cleanup frappe/frappe#478 2014-04-10 18:43:07 +05:30
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