Anand Doshi
|
70902da4da
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/december_2012/deprecate_tds.py
patches/june_2012/reports_list_permission.py
selling/doctype/sales_bom/locale/_messages_doc.json
selling/doctype/sales_bom/locale/ar-doc.json
selling/doctype/sales_bom/locale/de-doc.json
selling/doctype/sales_bom/locale/es-doc.json
selling/doctype/sales_bom/locale/fr-doc.json
selling/doctype/sales_bom/locale/hi-doc.json
selling/doctype/sales_bom/locale/hr-doc.json
selling/doctype/sales_bom/locale/nl-doc.json
selling/doctype/sales_bom/locale/pt-BR-doc.json
selling/doctype/sales_bom/locale/pt-doc.json
selling/doctype/sales_bom/locale/sr-doc.json
selling/doctype/sales_bom/locale/ta-doc.json
selling/doctype/sales_bom/locale/th-doc.json
selling/doctype/sales_bom_item/locale/_messages_doc.json
selling/doctype/sales_bom_item/locale/ar-doc.json
selling/doctype/sales_bom_item/locale/de-doc.json
selling/doctype/sales_bom_item/locale/es-doc.json
selling/doctype/sales_bom_item/locale/fr-doc.json
selling/doctype/sales_bom_item/locale/hi-doc.json
selling/doctype/sales_bom_item/locale/hr-doc.json
selling/doctype/sales_bom_item/locale/nl-doc.json
selling/doctype/sales_bom_item/locale/pt-BR-doc.json
selling/doctype/sales_bom_item/locale/pt-doc.json
selling/doctype/sales_bom_item/locale/sr-doc.json
selling/doctype/sales_bom_item/locale/ta-doc.json
selling/doctype/sales_bom_item/locale/th-doc.json
|
2013-06-26 14:07:29 +05:30 |
|
Anand Doshi
|
8bef70cceb
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-26 13:53:17 +05:30 |
|
Anand Doshi
|
bd7218979e
|
[shipping rule] added doctypes shipping rule and shipping rule conditions
|
2013-06-26 13:53:01 +05:30 |
|
Akhilesh Darjee
|
4c819edf24
|
[Report] Added rounded_total & outstanding_amount to Sales & Purchase Register
|
2013-06-26 11:28:53 +05:30 |
|
Nabin Hait
|
df6ad717b2
|
Merge pull request #517 from akhileshdarjee/master
[Report] Cleanup of Territory Target Variance, Sales Person Target Variance, Budget Variance Report & Item Prices
|
2013-06-25 02:53:58 -07:00 |
|
Nabin Hait
|
cca41a172c
|
[fix][report] general ledger
|
2013-06-25 14:14:32 +05:30 |
|
Nabin Hait
|
909e8b120f
|
[fix][report] general ledger
|
2013-06-25 14:08:18 +05:30 |
|
Rushabh Mehta
|
d242a8babd
|
[patch] breakup global defaults
|
2013-06-25 11:46:07 +05:30 |
|
Akhilesh Darjee
|
78e622ef5c
|
Deleted search criteria
|
2013-06-25 11:08:19 +05:30 |
|
Rushabh Mehta
|
7a93d5de30
|
[bug fixes] [global defaults] [cleanup]
|
2013-06-24 18:18:46 +05:30 |
|
Nabin Hait
|
3e8eca35a2
|
[report][fix] stock balance
|
2013-06-24 17:18:24 +05:30 |
|
Rushabh Mehta
|
7925bd7079
|
[merge]
|
2013-06-24 15:47:02 +05:30 |
|
Rushabh Mehta
|
847cfe2b07
|
[docs] [setup] cleanup
|
2013-06-24 15:43:18 +05:30 |
|
Nabin Hait
|
82366d3bb8
|
[report] deleted old reports based on search_criteria
|
2013-06-24 14:31:56 +05:30 |
|
Nabin Hait
|
8b96ba1da6
|
[general ledger] group by voucher
|
2013-06-24 13:54:16 +05:30 |
|
Nabin Hait
|
4cd977a2a9
|
[fixes] pull previous doc details
|
2013-06-24 12:20:35 +05:30 |
|
Nabin Hait
|
65f038c926
|
[fixes] pull previous doc details
|
2013-06-24 11:59:37 +05:30 |
|
Anand Doshi
|
61a2f68bc6
|
[webshop] territories in price list, taxes, updates in shopping cart settings
|
2013-06-21 17:55:31 +05:30 |
|
Nabin Hait
|
8086125705
|
Merge pull request #513 from saurabh6790/master
Trends Analyzer's Cleanup Complete
|
2013-06-21 03:37:59 -07:00 |
|
Nabin Hait
|
f78d16cca1
|
[general ledger] group by voucher option
|
2013-06-21 15:13:49 +05:30 |
|
Akhilesh Darjee
|
64c8e28423
|
[Fixed] Merge conflict fixed
|
2013-06-21 13:09:18 +05:30 |
|
Akhilesh Darjee
|
1ded5c618e
|
[Report]Cleanup of territory target variance, sales person target variance & budget variance reports
|
2013-06-21 12:47:51 +05:30 |
|
Anand Doshi
|
d52b03a8cc
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/search_criteria/trend_analyzer/trend_analyzer.py
buying/doctype/purchase_common/purchase_common.js
|
2013-06-21 12:22:52 +05:30 |
|
Saurabh
|
f8f68c54d9
|
[trends analyzer] cleanup completed
|
2013-06-20 18:52:31 +05:30 |
|
Nabin Hait
|
0930b94264
|
[target report] cleanup
|
2013-06-20 16:35:09 +05:30 |
|
Akhilesh Darjee
|
e6974d10c2
|
Fixed conflict merge
|
2013-06-20 15:22:04 +05:30 |
|
Akhilesh Darjee
|
92571c6929
|
[Report] Completed Budget variance Report and corrections in Territory Target Varinace & Sales Person Target Variance Report
|
2013-06-19 18:15:20 +05:30 |
|
Akhilesh Darjee
|
4ddc2618e8
|
[Report] Completed Sales Person Target Variance (Item-Group wise)
|
2013-06-18 18:46:02 +05:30 |
|
Rushabh Mehta
|
64c2764b56
|
[translations/build] deleted translation files (to be built on demand)
|
2013-06-17 11:56:41 +05:30 |
|
Saurabh
|
feb8669cbd
|
[Reports][Validation changes in Purchase and Sales trends]
|
2013-06-14 17:40:48 +05:30 |
|
Saurabh
|
606d8383ff
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-14 16:48:41 +05:30 |
|
Saurabh
|
1848b71a0a
|
[Reports][Sales and Purchase Trends][Completed]
|
2013-06-14 15:03:45 +05:30 |
|
Rushabh Mehta
|
37982a6a1f
|
[contact/address] fixed auto setting closes #475 (erpnext)
|
2013-06-14 13:29:20 +05:30 |
|
Rushabh Mehta
|
798262d09b
|
[docs] [fixes] fixes to link selection, attachment exception, pageview
|
2013-06-14 11:33:01 +05:30 |
|
Saurabh
|
0326f5414e
|
[reports][purchase and sales trends]
|
2013-06-13 19:17:56 +05:30 |
|
Saurabh
|
f9966f44cd
|
[Report][Quotation Trend Complete]
|
2013-06-12 17:55:19 +05:30 |
|
Anand Doshi
|
9c901e75cd
|
[sales invoice] [cleanup] removed basic info section
|
2013-06-12 15:28:45 +05:30 |
|
Saurabh
|
bcbd9a4800
|
[Report][Quotation Trend]
|
2013-06-11 18:06:58 +05:30 |
|
Anand Doshi
|
b893b4c081
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-11 17:56:55 +05:30 |
|
Anand Doshi
|
0865f60673
|
[chart of accounts/cost center] [fix] check permission before enabling add child
|
2013-06-11 17:48:59 +05:30 |
|
Anand Doshi
|
3daf45fcd8
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-11 17:34:18 +05:30 |
|
Anand Doshi
|
2e0cc41fc6
|
[chart of accounts/cost center] [add account/cost center] fix in permission issue
|
2013-06-11 17:33:37 +05:30 |
|
Anand Doshi
|
b53b9dcff4
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-11 16:23:45 +05:30 |
|
Anand Doshi
|
27e6f13b5d
|
[cleanup] deprecated search criteria, amendment_date, cancel_reason
|
2013-06-11 16:23:18 +05:30 |
|
Rushabh Mehta
|
94acdca8d1
|
[docs] added docs for accounts
|
2013-06-11 16:06:37 +05:30 |
|
Rushabh Mehta
|
7a22616d71
|
[cleanup] GL Control, Multi Ledger Report Detail, Trend Analyzer Control
|
2013-06-11 16:05:56 +05:30 |
|
Anand Doshi
|
618edee8b7
|
[search criteria] [cleanup] removed search criteria folders and files
|
2013-06-11 15:04:37 +05:30 |
|
Anand Doshi
|
49af8754d5
|
[auto inventory accounting] [general ledger entry] calculate valuation amount without rounding
|
2013-06-11 12:40:46 +05:30 |
|
Rushabh Mehta
|
0ab1bdf94e
|
[cleanup] old Workflow Engine, State, Sales Browser Control, Naming Series Options
|
2013-06-11 12:35:46 +05:30 |
|
Anand Doshi
|
f16836d75b
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-10 17:59:04 +05:30 |
|