Nabin Hait
|
b7e91ee95e
|
with_doc issue fixes
|
2014-06-26 15:54:45 +05:30 |
|
Anand Doshi
|
f1af06c00d
|
Merge remote-tracking branch 'frappe/develop' into wip-4.1
|
2014-06-26 15:05:42 +05:30 |
|
Nabin Hait
|
3e6586f58d
|
minor fix
|
2014-06-26 14:56:47 +05:30 |
|
Nabin Hait
|
cf2632fe59
|
Fetch warehouse from pos settings
|
2014-06-26 13:05:10 +05:30 |
|
Anand Doshi
|
56198f40ac
|
Changed System Signature to Footer
|
2014-06-26 12:47:45 +05:30 |
|
Nabin Hait
|
4a1c897b2d
|
Select field options in serial no
|
2014-06-26 12:35:14 +05:30 |
|
Anand Doshi
|
1030af7b48
|
Material Request: fixed series issue in insert_purchase_request
|
2014-06-26 12:07:55 +05:30 |
|
Anand Doshi
|
7f41ff26fa
|
Fixes frappe/erpnext#1849
|
2014-06-26 12:02:55 +05:30 |
|
Nabin Hait
|
500e1bc9b5
|
Show Frozen field in account to all if Frozen Account Modifier is not specified in Accounts Settings
|
2014-06-26 10:53:32 +05:30 |
|
Nabin Hait
|
00778c9a1e
|
Validate expense account for perpetual inventory
|
2014-06-25 19:12:24 +05:30 |
|
Nabin Hait
|
33a21ffbdc
|
Minor fixes in recurring invoice
|
2014-06-25 18:35:36 +05:30 |
|
Anand Doshi
|
5263b1a9c1
|
Merge remote-tracking branch 'frappe/develop' into wip-4.1
|
2014-06-25 17:06:51 +05:30 |
|
Anand Doshi
|
d12be12f72
|
Fixed gantt chart query for Task
|
2014-06-25 16:57:51 +05:30 |
|
Anand Doshi
|
fda8858fc3
|
Warehouse query filtered by company
|
2014-06-25 16:57:50 +05:30 |
|
Nabin Hait
|
29de86253f
|
minor fixes
|
2014-06-25 16:57:50 +05:30 |
|
Nabin Hait
|
c7c89a5927
|
Cost center-wise net profit in financial analytics report
|
2014-06-25 16:57:50 +05:30 |
|
Nabin Hait
|
48f1142523
|
Fixed address deletion issue
|
2014-06-25 16:57:50 +05:30 |
|
Nabin Hait
|
9c2459658a
|
Fixes for recurring invoice
|
2014-06-25 16:57:50 +05:30 |
|
Anand Doshi
|
ca37ff8b08
|
Fix in pricing rule patch
|
2014-06-25 16:57:50 +05:30 |
|
Nabin Hait
|
e6440a75b5
|
Allowed renaming for project
|
2014-06-25 16:57:50 +05:30 |
|
Nabin Hait
|
2b400dc2ad
|
stock entry incoming rate based on precision
|
2014-06-25 16:57:49 +05:30 |
|
Nabin Hait
|
860b2e2bbb
|
Fixes in pricing rule
|
2014-06-25 16:57:49 +05:30 |
|
Nabin Hait
|
f27fa5cbf3
|
Fixes in pricing rule
|
2014-06-25 16:57:49 +05:30 |
|
Nabin Hait
|
98bec6f96b
|
Fixes in pricing rule
|
2014-06-25 16:57:49 +05:30 |
|
Nabin Hait
|
379d86f9a3
|
sms sending issue fixed
|
2014-06-25 16:57:49 +05:30 |
|
Anand Doshi
|
8b2dfcff29
|
Naming Series Property Setter Patch
|
2014-06-25 16:57:49 +05:30 |
|
Nabin Hait
|
b569930b2a
|
Made warehouse and selling pricing list non-mandatory in pos setting
|
2014-06-25 16:57:48 +05:30 |
|
Nabin Hait
|
061c9744af
|
Set status button in serial no
|
2014-06-25 16:57:48 +05:30 |
|
Nabin Hait
|
43616619ec
|
Set status button in serial no
|
2014-06-25 16:57:48 +05:30 |
|
Nabin Hait
|
838aeb149f
|
minor fix in sales invoice
|
2014-06-25 16:57:48 +05:30 |
|
Rushabh Mehta
|
37f809a1f4
|
fix end of life query for item
|
2014-06-25 16:57:48 +05:30 |
|
Rushabh Mehta
|
32303daf63
|
fixes to bom.js
|
2014-06-25 16:57:48 +05:30 |
|
Anand Doshi
|
d709f4dfdd
|
Naming Series property type as Text
|
2014-06-25 16:57:47 +05:30 |
|
Nabin Hait
|
80142af9b8
|
Minor fixes
|
2014-06-25 16:57:47 +05:30 |
|
Nabin Hait
|
1b1b3a8fd6
|
validate pricing rule discount with item max discount
|
2014-06-25 16:57:47 +05:30 |
|
Nabin Hait
|
afffd656f6
|
Reload pricing rule in patch
|
2014-06-25 16:57:47 +05:30 |
|
Nabin Hait
|
4f6e31eb08
|
validate pricing rule discount with item max discount
|
2014-06-25 16:57:47 +05:30 |
|
Nabin Hait
|
9daca108b3
|
Pricing Rule fixes and improvements. Fixes #1795
|
2014-06-25 16:57:47 +05:30 |
|
Anand Doshi
|
de5e397fd4
|
Inventory Accounting: Cost Center only required for Expense Account
|
2014-06-25 16:57:46 +05:30 |
|
Anand Doshi
|
f5ec92c79a
|
Validate Select field values
|
2014-06-25 16:57:46 +05:30 |
|
Anand Doshi
|
f654fea736
|
Fixed feed type options
|
2014-06-25 16:57:08 +05:30 |
|
Anand Doshi
|
daa56ca50f
|
Fixed number format in currency
|
2014-06-25 16:57:08 +05:30 |
|
Anand Doshi
|
c20de7b264
|
Minor fix in Journal Voucher
|
2014-06-25 16:57:07 +05:30 |
|
Nabin Hait
|
c5e813f9f4
|
Overwrite from POS Settings if value exists
|
2014-06-25 16:57:07 +05:30 |
|
Nabin Hait
|
3b7dd0396f
|
Get party details fixes
|
2014-06-25 16:57:07 +05:30 |
|
Nabin Hait
|
c226292d8e
|
Stocvk entry incoming rate for sales return
|
2014-06-25 16:57:07 +05:30 |
|
Nabin Hait
|
216e5bb208
|
Incoming rate for sales return
|
2014-06-25 16:57:07 +05:30 |
|
Nabin Hait
|
afdc0a5f59
|
Valuation rate and amount for fg item
|
2014-06-25 16:57:07 +05:30 |
|
Anand Doshi
|
5a9e00ce71
|
Fixed Employee Leave Balance Report
|
2014-06-25 16:57:07 +05:30 |
|
Anand Doshi
|
ca3d60c160
|
Fixed Sales Order -> Delivery Note mapping of address fields
|
2014-06-25 16:57:06 +05:30 |
|
Anand Doshi
|
222b7b660e
|
Stock Entry: get fg item incoming rate if bom is mentioned
|
2014-06-25 16:57:06 +05:30 |
|
Anand Doshi
|
a469954ef3
|
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
This reverts commit 297939325a.
|
2014-06-25 16:57:06 +05:30 |
|
Anand Doshi
|
457515fc08
|
Stock Entry: get fg item incoming rate if bom is mentioned
|
2014-06-25 16:57:05 +05:30 |
|
Anand Doshi
|
e3ac8dd5a8
|
Don't set default for warehouse when creating serial no
|
2014-06-25 16:57:05 +05:30 |
|
Anand Doshi
|
14920b447c
|
Fixed Currency Exchange error
|
2014-06-25 16:57:04 +05:30 |
|
Nabin Hait
|
0c6177dd9a
|
Patch: update users report view settings for rename fields
|
2014-06-25 16:57:04 +05:30 |
|
Nabin Hait
|
cea571fc31
|
Fixes in fetching valuation rate in stock entry
|
2014-06-25 16:57:03 +05:30 |
|
Nabin Hait
|
d5a4c871f2
|
Field renamed in sms center
|
2014-06-25 16:57:02 +05:30 |
|
Nabin Hait
|
7c6c2e0ccf
|
Do not make packing list after submission
|
2014-06-25 16:57:02 +05:30 |
|
Rushabh Mehta
|
476d1fb334
|
Update sms_center.json
changed total words to total characters
|
2014-06-25 16:57:01 +05:30 |
|
Anand Doshi
|
a740f750c7
|
Stock Entry: Serial No Mandatory when purpose in Material Transfer, Sales Return, Purchase Return
|
2014-06-25 13:31:02 +05:30 |
|
Anand Doshi
|
610a405c85
|
Fix in warehouse query
|
2014-06-25 13:30:26 +05:30 |
|
Anand Doshi
|
4864c9e96a
|
Fixed gantt chart query for Task
|
2014-06-24 18:53:17 +05:30 |
|
Anand Doshi
|
faefeaa644
|
Warehouse query filtered by company
|
2014-06-24 18:53:04 +05:30 |
|
Anand Doshi
|
e0a7ff77df
|
Merge pull request #1838 from nabinhait/v4-hotfix
Multiple fixes
|
2014-06-24 17:37:39 +05:30 |
|
Nabin Hait
|
60c48fee16
|
minor fixes
|
2014-06-24 17:34:52 +05:30 |
|
Nabin Hait
|
0b15755441
|
Cost center-wise net profit in financial analytics report
|
2014-06-24 17:02:45 +05:30 |
|
Nabin Hait
|
e9b95bbfe8
|
Fixed address deletion issue
|
2014-06-24 16:35:00 +05:30 |
|
Nabin Hait
|
d0bf91d639
|
Fixes for recurring invoice
|
2014-06-24 16:19:16 +05:30 |
|
Anand Doshi
|
a1be6021c4
|
Fix in pricing rule patch
|
2014-06-24 15:26:40 +05:30 |
|
Nabin Hait
|
21efc93e54
|
Allowed renaming for project
|
2014-06-24 12:44:49 +05:30 |
|
Nabin Hait
|
fdf38dab6f
|
stock entry incoming rate based on precision
|
2014-06-24 12:42:36 +05:30 |
|
Rushabh Mehta
|
5dfacf2615
|
Merge pull request #1834 from nabinhait/v4-hotfix
Multiple fixes
|
2014-06-24 12:09:12 +05:30 |
|
Nabin Hait
|
613d784cfb
|
Fixes in pricing rule
|
2014-06-24 12:07:56 +05:30 |
|
Nabin Hait
|
efd426650d
|
Fixes in pricing rule
|
2014-06-24 11:11:08 +05:30 |
|
Nabin Hait
|
f62b75c731
|
Fixes in pricing rule
|
2014-06-24 11:00:13 +05:30 |
|
Nabin Hait
|
65efd0a9a1
|
sms sending issue fixed
|
2014-06-23 18:21:37 +05:30 |
|
Anand Doshi
|
83da92fdcc
|
Naming Series Property Setter Patch
|
2014-06-23 18:04:07 +05:30 |
|
Nabin Hait
|
16fa6472b3
|
Made warehouse and selling pricing list non-mandatory in pos setting
|
2014-06-23 16:42:36 +05:30 |
|
Anand Doshi
|
6781f62c70
|
Merge pull request #1828 from rmehta/develop
item query fix
|
2014-06-23 15:53:38 +05:30 |
|
Anand Doshi
|
a445c39901
|
Merge pull request #1829 from nabinhait/v4-hotfix
V4 hotfix
|
2014-06-23 15:52:54 +05:30 |
|
Nabin Hait
|
da490e3f53
|
Set status button in serial no
|
2014-06-23 15:51:03 +05:30 |
|
Nabin Hait
|
ccd2e2496c
|
Merge pull request #1827 from anandpdoshi/anand-wip
Naming Series property type as Text
|
2014-06-23 15:44:29 +05:30 |
|
Nabin Hait
|
36da171a3d
|
Set status button in serial no
|
2014-06-23 15:36:31 +05:30 |
|
Nabin Hait
|
e84f8b23aa
|
minor fix in sales invoice
|
2014-06-23 15:36:30 +05:30 |
|
Rushabh Mehta
|
864d1ea87f
|
fix end of life query for item
|
2014-06-23 12:20:39 +05:30 |
|
Rushabh Mehta
|
58ff651c6d
|
fixes to bom.js
|
2014-06-23 12:20:39 +05:30 |
|
Anand Doshi
|
f0a1735ac8
|
Naming Series property type as Text
|
2014-06-20 20:19:51 +05:30 |
|
Nabin Hait
|
56f6d01757
|
Minor fixes
|
2014-06-20 19:37:53 +05:30 |
|
Nabin Hait
|
3c946b2a72
|
validate pricing rule discount with item max discount
|
2014-06-20 19:07:44 +05:30 |
|
Nabin Hait
|
1d37698d4c
|
Reload pricing rule in patch
|
2014-06-20 16:30:44 +05:30 |
|
Nabin Hait
|
be50c289f8
|
validate pricing rule discount with item max discount
|
2014-06-20 16:19:55 +05:30 |
|
Nabin Hait
|
444f956e7b
|
Pricing Rule fixes and improvements. Fixes #1795
|
2014-06-20 16:00:45 +05:30 |
|
Anand Doshi
|
496123a646
|
Inventory Accounting: Cost Center only required for Expense Account
|
2014-06-19 19:25:19 +05:30 |
|
Anand Doshi
|
7bbaf0298e
|
Merge pull request #1821 from nabinhait/v4-hotfix
Overwrite from POS Settings if value exists
|
2014-06-19 16:48:53 +05:30 |
|
Anand Doshi
|
a5cfc59d81
|
Validate Select field values
|
2014-06-19 16:05:08 +05:30 |
|
Anand Doshi
|
da342c7855
|
Fixed feed type options
|
2014-06-18 21:09:19 +05:30 |
|
Anand Doshi
|
aecddefbc8
|
Fixed number format in currency
|
2014-06-18 20:55:39 +05:30 |
|
Anand Doshi
|
fd05f458e1
|
Minor fix in Journal Voucher
|
2014-06-18 20:55:18 +05:30 |
|
Nabin Hait
|
faf176d78c
|
Overwrite from POS Settings if value exists
|
2014-06-18 19:52:24 +05:30 |
|
Rushabh Mehta
|
151125e537
|
fixed for travis
|
2014-06-18 17:33:01 +05:30 |
|
Anand Doshi
|
64a0eb42ed
|
Merge pull request #1816 from nabinhait/v4-hotfix
Stock Entry incoming rate
|
2014-06-18 17:32:04 +05:30 |
|
Nabin Hait
|
4d7c4fc0f4
|
Get party details fixes
|
2014-06-18 16:40:59 +05:30 |
|
Nabin Hait
|
e7c2f74a07
|
Stocvk entry incoming rate for sales return
|
2014-06-18 16:40:59 +05:30 |
|
Nabin Hait
|
a7da6e1480
|
Incoming rate for sales return
|
2014-06-18 16:40:59 +05:30 |
|
Nabin Hait
|
ae0d753cad
|
Valuation rate and amount for fg item
|
2014-06-18 16:40:59 +05:30 |
|
Anand Doshi
|
31c977b906
|
Fixed Employee Leave Balance Report
|
2014-06-18 16:26:45 +05:30 |
|
Anand Doshi
|
d768afb80b
|
Fixed Sales Order -> Delivery Note mapping of address fields
|
2014-06-18 15:23:25 +05:30 |
|
Anand Doshi
|
de12a0941f
|
Stock Entry: get fg item incoming rate if bom is mentioned
|
2014-06-18 14:05:29 +05:30 |
|
Anand Doshi
|
987a28fc6a
|
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
This reverts commit 297939325a.
|
2014-06-18 14:05:08 +05:30 |
|
Anand Doshi
|
297939325a
|
Stock Entry: get fg item incoming rate if bom is mentioned
|
2014-06-18 13:10:10 +05:30 |
|
Anand Doshi
|
2f800521cb
|
Don't set default for warehouse when creating serial no
|
2014-06-18 12:48:46 +05:30 |
|
Anand Doshi
|
72a178a37e
|
Fixed Currency Exchange error
|
2014-06-18 12:14:17 +05:30 |
|
Nabin Hait
|
91090042d1
|
Patch: update users report view settings for rename fields
|
2014-06-18 10:29:53 +05:30 |
|
Nabin Hait
|
0693937c1e
|
Fixes in fetching valuation rate in stock entry
|
2014-06-18 10:20:01 +05:30 |
|
Nabin Hait
|
ac1a4ed576
|
Field renamed in sms center
|
2014-06-18 10:20:01 +05:30 |
|
Nabin Hait
|
b73d3f925d
|
Do not make packing list after submission
|
2014-06-18 10:18:50 +05:30 |
|
Rushabh Mehta
|
69641ddc36
|
Update sms_center.json
changed total words to total characters
|
2014-06-18 09:04:09 +05:30 |
|
Rushabh Mehta
|
36881807ed
|
Merge branch 'wip-4.2' into wip-4.1
|
2014-06-17 17:36:22 +05:30 |
|
Rushabh Mehta
|
1a18b427a8
|
make font size smaller for erpnext powered
|
2014-06-17 16:54:55 +05:30 |
|
Rushabh Mehta
|
69ce97b80a
|
added print format for general ledger
|
2014-06-17 16:54:55 +05:30 |
|
Rushabh Mehta
|
9f887b436c
|
fixes new routing, for frappe/frappe#600
|
2014-06-17 16:53:44 +05:30 |
|
Anand Doshi
|
1c5fb9495e
|
Merge pull request #1806 from nabinhait/v4-hotfix
Fixes
|
2014-06-17 14:54:44 +05:30 |
|
Rushabh Mehta
|
5df521bad5
|
updated generators for wip-4.2
|
2014-06-17 14:21:26 +05:30 |
|
Anand Doshi
|
b20de6a3ec
|
Sales Invoice List: show percent paid as 100% if grand total is 0
|
2014-06-17 13:58:06 +05:30 |
|
Nabin Hait
|
4ee8704b99
|
Fixes in financial analytics
|
2014-06-17 13:52:03 +05:30 |
|
Nabin Hait
|
d2e8a0a96a
|
Delivery note update after submission
|
2014-06-17 12:55:52 +05:30 |
|
Nabin Hait
|
98d9d797fd
|
Tax category validation ignored in material request
|
2014-06-16 15:54:05 +05:30 |
|
Nabin Hait
|
a6fc3f6337
|
Ignore pricing rule for material request
|
2014-06-16 15:34:52 +05:30 |
|
Nabin Hait
|
539f352318
|
Delivery note to packing slip mapping
|
2014-06-16 15:03:36 +05:30 |
|
Nabin Hait
|
e1b2b3e995
|
Account common get_query
|
2014-06-16 15:03:36 +05:30 |
|
Rushabh Mehta
|
3b7bcf0f4f
|
make font size smaller for erpnext powered
|
2014-06-16 14:21:37 +05:30 |
|
Rushabh Mehta
|
03ae32d937
|
added print format for general ledger
|
2014-06-16 14:21:37 +05:30 |
|
Anand Doshi
|
ccf370f813
|
Fixed item query
|
2014-06-16 13:50:11 +05:30 |
|
Anand Doshi
|
0521814dea
|
Fixed item query
|
2014-06-16 13:25:20 +05:30 |
|
Anand Doshi
|
e35841a2ea
|
Reload Shopping Cart Settings in create price list patch
|
2014-06-16 12:59:54 +05:30 |
|
Anand Doshi
|
3474c273a5
|
Ignore mandatory in employee patch
|
2014-06-16 12:14:21 +05:30 |
|
Anand Doshi
|
3dc722b096
|
Create price list only if setup complete
|
2014-06-13 15:30:38 +05:30 |
|
Anand Doshi
|
c1bfb63d96
|
Create price list if missing
|
2014-06-13 12:41:08 +05:30 |
|
Anand Doshi
|
27e295a4cb
|
Merge pull request #1789 from nabinhait/v4-hotfix
V4 hotfix
|
2014-06-12 15:39:58 +05:30 |
|
Nabin Hait
|
f2202fc014
|
minor fix
|
2014-06-12 15:20:47 +05:30 |
|
Anand Doshi
|
3761ff3522
|
Fix in patch: split email settings
|
2014-06-12 15:00:52 +05:30 |
|
Anand Doshi
|
205438669a
|
Removed clear_custom_buttons, pos view switch fix
|
2014-06-12 15:00:51 +05:30 |
|
Nabin Hait
|
e7f2d3179d
|
update other_charges in custom print formats
|
2014-06-12 14:58:09 +05:30 |
|
Nabin Hait
|
46dc3b1442
|
validations added in stock entry
|
2014-06-12 12:48:28 +05:30 |
|
Nabin Hait
|
2128c98c35
|
available qty validation. Fixes #1045
|
2014-06-12 12:42:22 +05:30 |
|
Nabin Hait
|
e98b326ba3
|
Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932
|
2014-06-12 12:25:23 +05:30 |
|
Rushabh Mehta
|
7bcd31bddb
|
Merge pull request #1785 from rmehta/develop
minor fix for outgoing communication email
|
2014-06-12 10:32:21 +05:30 |
|
Rushabh Mehta
|
6def968c3c
|
minor fix for outgoing communication email
|
2014-06-12 10:31:43 +05:30 |
|
Nabin Hait
|
589a298096
|
Minor fixes in salary manager. Fixes #1754
|
2014-06-11 13:00:31 +05:30 |
|