Anand Doshi
|
15db6c4659
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.py
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
buying/doctype/supplier_quotation/supplier_quotation.js
patches/patch_list.py
|
2013-07-02 11:50:32 +05:30 |
|
Saurabh
|
d6cc5cd08f
|
[Trends Teports] cleanup
|
2013-06-28 10:09:46 +05:30 |
|
Akhilesh Darjee
|
f1845cf7c9
|
Removed errprint from purchase register
|
2013-06-27 11:06:11 +05:30 |
|
Akhilesh Darjee
|
f47617c6e6
|
[Fix] Purchase Register
|
2013-06-27 11:01:36 +05:30 |
|
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 |
|
Akhilesh Darjee
|
4c819edf24
|
[Report] Added rounded_total & outstanding_amount to Sales & Purchase Register
|
2013-06-26 11:28:53 +05:30 |
|
Akhilesh Darjee
|
78e622ef5c
|
Deleted search criteria
|
2013-06-25 11:08:19 +05:30 |
|
Rushabh Mehta
|
7925bd7079
|
[merge]
|
2013-06-24 15:47:02 +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 |
|
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 |
|
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 |
|
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 |
|
Saurabh
|
0326f5414e
|
[reports][purchase and sales trends]
|
2013-06-13 19:17:56 +05:30 |
|
Anand Doshi
|
7e2010a649
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-10 15:25:07 +05:30 |
|
Nabin Hait
|
6164b89e95
|
[report] listing on home page
|
2013-06-06 17:18:38 +05:30 |
|
Nabin Hait
|
c36e2653f9
|
[report] itemwise purchase register
|
2013-06-05 16:13:05 +05:30 |
|
Nabin Hait
|
196b6b8b68
|
[report] itemwise sales register
|
2013-06-05 16:12:42 +05:30 |
|
Nabin Hait
|
6f19527063
|
[report] po and pr items to be billed based on amount
|
2013-06-05 13:02:16 +05:30 |
|
Nabin Hait
|
90202aec2b
|
[merge conflict]
|
2013-06-05 12:37:10 +05:30 |
|
Saurabh
|
4bf08fa1cd
|
[Reports][Supplier Account Head -> Account] and [Project wise Stock Tracking -> Project]
|
2013-06-04 15:51:16 +05:30 |
|
Saurabh
|
df531accc9
|
[report] customer account head
|
2013-06-03 16:18:24 +05:30 |
|
Saurabh
|
a0814bb96a
|
[report] customer account head
|
2013-06-03 16:10:52 +05:30 |
|
Anand Doshi
|
ecc28f0311
|
[sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice
|
2013-05-30 17:43:30 +05:30 |
|
Nabin Hait
|
7742e2baed
|
[report][fix]
|
2013-05-28 17:58:36 +05:30 |
|
Nabin Hait
|
eca0531068
|
[report] purchase order/ received items to be billed
|
2013-05-28 16:07:03 +05:30 |
|
Nabin Hait
|
34d1b1415e
|
[report] filter added base on territory in sales personwise transaction summary
|
2013-05-28 12:32:21 +05:30 |
|
Nabin Hait
|
da6e4670a3
|
[report][fix] filter fixes in sales/pur register
|
2013-05-27 16:34:15 +05:30 |
|
Nabin Hait
|
765383b3cf
|
[report] monthly salary register
|
2013-05-10 18:41:58 +05:30 |
|
Nabin Hait
|
a55723bea2
|
[report] sales partners commission
|
2013-05-06 12:46:07 +05:30 |
|
Nabin Hait
|
e23d2a35c4
|
[fixes] sales/purchase register
|
2013-05-06 11:08:21 +05:30 |
|
Nabin Hait
|
4d7a1c1f35
|
[script report] payments made with ageing
|
2013-05-02 15:19:00 +05:30 |
|
Nabin Hait
|
d7889cd5d5
|
[script report] payment collection with ageing
|
2013-05-02 12:14:59 +05:30 |
|
Nabin Hait
|
81bbfba0cc
|
[hr] allowed rename in earning and deduction type
|
2013-05-02 11:27:25 +05:30 |
|
Nabin Hait
|
006d074b26
|
[script report] collection report
|
2013-05-01 15:05:29 +05:30 |
|
Nabin Hait
|
e388465e17
|
[script report] bank clearance summary
|
2013-05-01 12:23:07 +05:30 |
|
Nabin Hait
|
76646fb279
|
[script report] bank reconciliation statement in new style
|
2013-05-01 11:23:44 +05:30 |
|
Nabin Hait
|
84e2af2212
|
[report] add total row
|
2013-04-30 18:08:43 +05:30 |
|
Nabin Hait
|
98cfe688a8
|
[script report] purchase register in new style
|
2013-04-30 17:22:43 +05:30 |
|
Nabin Hait
|
5c2cb74e7a
|
[script report] sales register migrated into new script report
|
2013-04-24 15:46:09 +05:30 |
|
Nabin Hait
|
b2972dca98
|
[script report] accounts payable migrated to new style
|
2013-04-23 15:53:33 +05:30 |
|
Nabin Hait
|
ebd514442a
|
[script report] accounts payable migrated to new style
|
2013-04-23 15:36:26 +05:30 |
|
Nabin Hait
|
e7366f763b
|
[report] accounts receivable migrated into new style
|
2013-04-22 13:14:52 +05:30 |
|
Anand Doshi
|
10a209d405
|
[gross profit] [request] added Avg. Buying Rate column
|
2013-03-29 12:26:47 +05:30 |
|