Rushabh Mehta
|
df8b652402
|
[accounts] [feature] added default_cash_account in company and gets set in Journal Voucher
|
2013-03-25 15:44:36 +05:30 |
|
Rushabh Mehta
|
c5570c6341
|
added warehouse company validation, if warehouse is added to company
|
2013-03-25 15:21:24 +05:30 |
|
Anand Doshi
|
256f29a580
|
Merge pull request #319 from akhileshdarjee/master
Barcode problems fixed in Invoices
|
2013-03-25 01:07:13 -07:00 |
|
Akhilesh Darjee
|
498bed7b66
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-03-25 12:52:54 +05:30 |
|
Akhilesh Darjee
|
7e062b3352
|
barcode error in sales_invoice fixed.
|
2013-03-25 12:28:39 +05:30 |
|
Anand Doshi
|
73ea15d2d3
|
for checking timelog conflicts, also check if tasks are the same
|
2013-03-25 12:09:24 +05:30 |
|
Anand Doshi
|
44e35ab231
|
removed unnecessary imports from backup manager files
|
2013-03-22 18:47:52 +05:30 |
|
Anand Doshi
|
aeed499d12
|
Merge branch 'master' into edge
Conflicts:
setup/doctype/backup_manager/backup_dropbox.py
|
2013-03-22 18:43:47 +05:30 |
|
Anand Doshi
|
b632ba5f51
|
changed fieldtype of repeat_on_day_of_month to Int
|
2013-03-22 18:38:33 +05:30 |
|
Anand Doshi
|
b70b93260c
|
Merge pull request #318 from akhileshdarjee/master
Permissions in Invoices fixed.
|
2013-03-22 06:06:56 -07:00 |
|
Akhilesh Darjee
|
2f2ac966ad
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-03-22 18:28:51 +05:30 |
|
Akhilesh Darjee
|
ac61ec3a5b
|
Permissions problem in invoice fixed.
|
2013-03-22 18:20:11 +05:30 |
|
Anand Doshi
|
a1e44e4202
|
Merge pull request #315 from mayur-patel/master
Added default for Employee doctype with help of Anand Doshi
|
2013-03-22 05:49:25 -07:00 |
|
Akhilesh Darjee
|
c3fde66f2c
|
contact us page problem fixed.
|
2013-03-22 18:05:22 +05:30 |
|
Anand Doshi
|
c8e64f5d42
|
shifted field category of Purchase Taxes and Charges to the left
|
2013-03-22 16:49:16 +05:30 |
|
Rushabh Mehta
|
3f725308e1
|
[website] [number_format] [fix] moved js function & added amount to order list
|
2013-03-22 14:56:31 +05:30 |
|
Anand Doshi
|
ceba917e86
|
Merge branch 'master' into edge
|
2013-03-22 14:16:53 +05:30 |
|
Rushabh Mehta
|
30be03673e
|
[website] [fix] no cache for order, ticket
|
2013-03-22 13:51:41 +05:30 |
|
Anand Doshi
|
a47ac1bed0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-22 13:32:11 +05:30 |
|
Anand Doshi
|
1b08d88bb4
|
fixes in stock grid report - trim spaces in serial no
|
2013-03-22 13:29:06 +05:30 |
|
Anand Doshi
|
a3b9b1a868
|
added filters from date and to date
|
2013-03-22 13:16:10 +05:30 |
|
Rushabh Mehta
|
a0fa3300b7
|
[website] [fix] signup permissions
|
2013-03-22 13:02:08 +05:30 |
|
Rushabh Mehta
|
da512ba8c9
|
website: made order and ticket listing
|
2013-03-22 12:45:44 +05:30 |
|
Nabin Hait
|
54e79995ee
|
fixes in trend analyzer
|
2013-03-22 12:35:11 +05:30 |
|
Nabin Hait
|
9d3f0405b7
|
fixes in packing slip
|
2013-03-22 12:02:48 +05:30 |
|
Anand Doshi
|
8c5844e3fb
|
show sales invoice data in gross profit report
|
2013-03-21 20:24:10 +05:30 |
|
Anand Doshi
|
6d8d3b4cee
|
fixes in gross profit report
|
2013-03-21 18:45:02 +05:30 |
|
Nabin Hait
|
4c56220089
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-21 18:37:48 +05:30 |
|
Nabin Hait
|
a0e7c1539b
|
aii: book expense in delivery note instead of sales invoice
|
2013-03-21 18:37:06 +05:30 |
|
Rushabh Mehta
|
11394f0986
|
Merge branch 'edge' of github.com:webnotes/erpnext into edge
|
2013-03-21 17:40:56 +05:30 |
|
Rushabh Mehta
|
af578d73ef
|
merge
|
2013-03-21 17:40:08 +05:30 |
|
Anand Doshi
|
162a081a9f
|
unchecked Not In Create in item customer detail and item price
|
2013-03-21 17:30:22 +05:30 |
|
Rushabh Mehta
|
4a80bc63b0
|
added permissions for server side print
|
2013-03-21 17:23:54 +05:30 |
|
Rushabh Mehta
|
bed19ac4d3
|
added website pages for orders, tickets and added sales invoice print format
|
2013-03-21 17:12:25 +05:30 |
|
mayur-patel
|
e635a45be9
|
Added new default value with help of Anand Doshi.
|
2013-03-21 21:30:34 +11:00 |
|
Akhilesh Darjee
|
34c13ac52c
|
added description to sales_invoice.txt
|
2013-03-21 13:22:32 +05:30 |
|
Akhilesh Darjee
|
fadffcf528
|
description added to 'Is Opening' and 'Aging Date' field
|
2013-03-21 13:06:41 +05:30 |
|
Anand Doshi
|
407331675f
|
recurring invoice test cases, set period start date and period end date as first and last day of the month if previously so, else just add months
|
2013-03-20 21:14:03 +05:30 |
|
Anand Doshi
|
5e63962ef2
|
Merge branch 'master' into edge
|
2013-03-20 17:06:49 +05:30 |
|
Anand Doshi
|
f0a8406d31
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-20 17:01:31 +05:30 |
|
Anand Doshi
|
7da72dd449
|
unlink against voucher in jv when Purchase Invoice, Sales Invoice or Journal Voucher are cancelled
|
2013-03-20 17:00:41 +05:30 |
|
Akhilesh Darjee
|
4e7a58608f
|
google drive redirect url fixed.
|
2013-03-20 16:33:02 +05:30 |
|
Anand Doshi
|
2d12a42145
|
Merge pull request #312 from saurabh6790/master
updated accounts_controller.py, buying_controller.py, selling_controller.py
|
2013-03-20 03:55:40 -07:00 |
|
Saurabh
|
f848b8bafc
|
merged backup manager python file
|
2013-03-20 13:55:08 +05:30 |
|
Saurabh
|
9c02b81cdd
|
merged backup dropbox file
|
2013-03-20 13:51:43 +05:30 |
|
Saurabh
|
076535d979
|
Merge branch 'master' of https://github.com/webnotes/erpnext
Conflicts:
controllers/buying_controller.py
|
2013-03-20 13:48:48 +05:30 |
|
Akhilesh Darjee
|
ba9ecaeef7
|
backup dropbox and googledrive problems fixed.
|
2013-03-20 13:47:17 +05:30 |
|
Akhilesh Darjee
|
3abf67cf5e
|
dropbox and googledrive problems fixed
|
2013-03-20 13:25:28 +05:30 |
|
Saurabh
|
6f75318134
|
no -ve balance accepted in sales and purchase invoice
|
2013-03-20 12:55:28 +05:30 |
|
Akhilesh Darjee
|
3433f11abe
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-03-20 12:50:57 +05:30 |
|