Nabin Hait
743f9664fc
Merge pull request #2785 from neilLasrado/kill-html-desc
...
patch fixes
2015-02-18 20:51:48 +05:30
Neil Trini Lasrado
ae3f4f363f
patch renamed
2015-02-18 20:48:26 +05:30
Neil Trini Lasrado
e9d45bcb28
patch fixes
2015-02-18 20:25:44 +05:30
Rushabh Mehta
8bb6e530c7
[fixes] accounts, stock changes
2015-02-18 20:22:59 +05:30
Rushabh Mehta
614e7ab757
[cleanup] SMS, and added item filter in stock balance
2015-02-18 19:51:48 +05:30
Rushabh Mehta
4ea1ade7b9
[hub] start
2015-02-18 19:09:56 +05:30
Nabin Hait
9252002249
Update taxes_and_totals.py
2015-02-18 18:48:30 +05:30
Nabin Hait
89c050e67d
removed print
2015-02-18 16:19:07 +05:30
Nabin Hait
8626d3881d
fixed renaming patch
2015-02-18 15:10:29 +05:30
Nabin Hait
06fd10620e
Merge pull request #2734 from neilLasrado/kill-html-desc
...
Kill html desc -WIP
2015-02-18 13:13:52 +05:30
Nabin Hait
5fd1727acd
Merge pull request #2752 from neilLasrado/stock-amount
...
client side - recalculate amount and total amount on change of qty or va...
2015-02-18 13:11:41 +05:30
Neil Trini Lasrado
e20057894e
Activity Type - permissions changed for users with system manager role
2015-02-18 13:06:12 +05:30
Neil Trini Lasrado
b091707ae8
Validate renaming of activity type - manufacturing
2015-02-18 13:00:56 +05:30
Neil Trini Lasrado
42e42b7647
fixes in patch
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
d98c4e007b
patch
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
d8b35639d8
image feild made hidden
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
7f70367dde
image view fixed for stock entry and bom
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
3361df709c
Image field and view added to all stock doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
6f51c2e4cc
Image field and view added to all buying doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
c48f06c095
Image field and view added to all selling doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
66df3566a9
html item desc removed from item master, item image added in oppurtunity
2015-02-18 12:32:37 +05:30
Nabin Hait
fe81da2dd1
listview indicator fix
2015-02-18 12:23:18 +05:30
Neil Trini Lasrado
b2c521847e
fixes
2015-02-18 12:07:09 +05:30
Nabin Hait
da5f766dd5
fixed conflict
2015-02-18 11:55:13 +05:30
Nabin Hait
b120520aa8
fixed patches
2015-02-18 11:54:08 +05:30
Neil Trini Lasrado
3efc6ab94d
fixes
2015-02-18 11:51:09 +05:30
Neil Trini Lasrado
9aafe76f63
client side - recalculate amount and total amount on change of qty or valuation reate of the item
2015-02-18 11:51:09 +05:30
Rushabh Mehta
2e0e711eb2
[minor] stock_ledger_entry.py
2015-02-18 11:38:48 +05:30
Nabin Hait
e55def23af
Merge pull request #2745 from neilLasrado/time-log
...
activity type fixes
2015-02-18 11:21:25 +05:30
Nabin Hait
d81e73e067
Merge pull request #2747 from neilLasrado/warehouse-filter
...
filters added to warehouses in prod order
2015-02-18 11:19:42 +05:30
Nabin Hait
1af9ac826c
Merge pull request #2763 from neilLasrado/production-planning-tool
...
fixes for capacity planning using production planning tool
2015-02-18 11:15:58 +05:30
Rushabh Mehta
df9e80c87a
[refactor] stock entry, minor ux
2015-02-17 19:56:04 +05:30
Rushabh Mehta
0fb678e7cf
[stock reco] cleanups
2015-02-17 19:56:04 +05:30
Anand Doshi
8c0f05fbae
[minor] grid report loading
2015-02-17 19:53:23 +05:30
Neil Trini Lasrado
7182d349df
fixes for capacity planning using production planning tool
2015-02-17 16:19:41 +05:30
Neil Trini Lasrado
744aec8def
activity type fixs
2015-02-17 16:12:32 +05:30
Neil Trini Lasrado
b13c4e2516
filters added to warehouses in prod order
2015-02-17 16:07:37 +05:30
Pratik Vyas
28777bf693
bumped to version 4.22.1
2015-02-17 16:32:58 +06:00
Anand Doshi
a6c361c00e
Setup Wizard: Load number format based on currency #2627 , login as first user on setup complete
2015-02-17 15:56:31 +05:30
Anand Doshi
0fe854692d
[fix] add CRM module to user desktop items in patch
2015-02-17 14:45:36 +05:30
Nabin Hait
7945195478
Merge pull request #2761 from neilLasrado/update-finished-goods-fix
...
Update finished goods fix
2015-02-17 14:21:41 +05:30
Nabin Hait
8dd0e9db15
Merge pull request #2759 from neilLasrado/prod-workstation
...
workstation and operation time made editable in production order.
2015-02-17 14:21:24 +05:30
Nabin Hait
13e6ac737f
Merge pull request #2748 from neilLasrado/get-prod-order
...
fixes in stock entry
2015-02-17 14:12:00 +05:30
Nabin Hait
44454cb81b
Merge pull request #2744 from neilLasrado/operation-time
...
operation time made mandatory in bom operations
2015-02-17 14:08:55 +05:30
Nabin Hait
133b7ed218
Merge pull request #2743 from neilLasrado/price-list
...
Price list name made - 'no copy'
2015-02-17 14:08:18 +05:30
Nabin Hait
cdb8e374e3
Merge pull request #2727 from neilLasrado/voucher-type
...
journal entry - accounts table cannot be blank - validation added
2015-02-17 14:07:44 +05:30
Nabin Hait
bd00e81ad5
Commonified taxes and totals calculation in server side
2015-02-17 12:50:51 +05:30
Rushabh Mehta
2712e36f08
[stock reco] added items table
2015-02-17 12:50:20 +05:30
Rushabh Mehta
06072c1e51
[refactor] Material Transfer for Manufacture
2015-02-17 11:50:45 +05:30
Nabin Hait
6f0a3ed8d4
fixed conflict
2015-02-17 11:12:04 +05:30
Nabin Hait
3237c75d98
Commonified taxes and totals calculation in server side
2015-02-17 11:11:11 +05:30
Rushabh Mehta
46e03eadca
[rename] Customer Issue -> Warranty Claim
2015-02-17 10:45:50 +05:30
Rushabh Mehta
60cfccbf77
[new-module] crm
2015-02-17 10:36:54 +05:30
Nabin Hait
b09ed41c52
Fetch default accounts, cost center only if company matches with the transactions
2015-02-17 10:34:17 +05:30
Rushabh Mehta
36b84408a8
[fixes] precision in purchase receipt and item group route
2015-02-16 18:26:38 +05:30
Neil Trini Lasrado
35898d7518
Update finished goods fix
2015-02-16 17:25:28 +05:30
Neil Trini Lasrado
f120aec9c2
workstation and operation time made editable in production order. Cost recalculation logic added
2015-02-16 15:10:29 +05:30
Pratik Vyas
2d916436c5
bumped to version 4.22.0
2015-02-16 12:50:19 +06:00
Pratik Vyas
b72abbc402
Update translations
2015-02-14 21:08:37 +05:30
Rushabh Mehta
7a64cb2aa5
[bom] [fix] company link
2015-02-13 16:11:25 +05:30
Neil Trini Lasrado
4d4c643b7e
fixes in stock entry
2015-02-13 13:09:17 +05:30
Rushabh Mehta
6efbc9dacd
[event] share with user
2015-02-13 10:17:13 +05:30
Anand Doshi
c82331bc19
[design] Setup Wizard
2015-02-12 20:02:17 +05:30
Nabin Hait
188f69a713
commonified totals calculation in js
2015-02-12 17:55:50 +05:30
Neil Trini Lasrado
06f712dcd7
operation time made mandatory in bom operations
2015-02-12 17:52:46 +05:30
Neil Trini Lasrado
62885b3c56
Price list name made -no copy
2015-02-12 17:41:20 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
dd1c2d3018
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-12 13:31:48 +05:30
Nabin Hait
4a149c0791
Chart of accounts cleanup for Nicaragua
2015-02-12 12:39:32 +05:30
Nabin Hait
031303d719
Replace renamed fields in custom script and custom print formats
2015-02-12 11:48:50 +05:30
Nabin Hait
56e6ad2112
Patch for renamed total fields
2015-02-12 11:48:20 +05:30
Nabin Hait
461ee2ebae
Renamed total fields
2015-02-12 11:47:45 +05:30
Nabin Hait
0c0749a884
Merge pull request #2721 from williamjmorenor/v5.0
...
Add chart of accounts template for Nicaragua
2015-02-12 11:46:43 +05:30
William Moreno
5b72e21186
Final Fixing
...
I will no make other changes, please can chech the JSON
2015-02-11 16:57:43 -06:00
William Moreno
a05e6df3f5
Minor Fix
2015-02-11 15:48:41 -06:00
William Moreno
dab1db9874
Minor Fix
2015-02-11 15:43:40 -06:00
William Moreno
8e5e414276
Minor fix
2015-02-11 15:38:27 -06:00
William Moreno
92774e4743
Minor fix
2015-02-11 15:36:14 -06:00
William Moreno
c2037c5444
Add root_type and account_type
2015-02-11 15:06:58 -06:00
William Moreno
0a582ec885
Validate JSON
2015-02-11 12:41:11 -06:00
William Moreno
df023bd8ad
Best accounts tax details
2015-02-11 12:38:51 -06:00
William Moreno
f2bf17f2e2
Best IFRS for SMES compatibility
2015-02-11 12:06:40 -06:00
William Moreno
43d39f8e4d
Best IFRS for SMES compatibility
2015-02-11 11:57:22 -06:00
William Moreno
6b34bca7d0
Best IFRS for SMES compatibility
2015-02-11 11:53:45 -06:00
William Moreno
6fd091d979
Rearrange accounts to improve readability
2015-02-11 09:36:03 -06:00
William Moreno
7d7113328d
Change Style => TITLE to Title
2015-02-11 09:22:55 -06:00
William Moreno
1caea2ebae
Fix missing Comma (,)
...
Yes, I did not validate the last edit to the JSON before commit, sorry
2015-02-11 07:39:23 -06:00
Neil Trini Lasrado
802d717a9e
fixes
2015-02-11 17:27:58 +05:30
Neil Trini Lasrado
934d63de16
journal entry - accounts table cannot be blank - validation added
2015-02-11 17:05:41 +05:30
Nabin Hait
ceb04726c8
Merge pull request #2725 from neilLasrado/workstation-operation-hours
...
Workstation Doc Fixed
2015-02-11 16:52:26 +05:30
Nabin Hait
27a1f20135
Merge pull request #2724 from neilLasrado/planned-start-date
...
validations added to production order
2015-02-11 16:51:39 +05:30
Neil Trini Lasrado
daaf5814fa
landed cost voucher fix
2015-02-11 16:23:46 +05:30
Pratik Vyas
ce7b238e88
Merge pull request #2726 from pdvyas/lang
...
Add Bosnian and Catalin language
2015-02-11 15:36:54 +05:30
Pratik Vyas
f082b3d8a1
add Bosnian and Catalin language
2015-02-11 15:12:56 +05:30
Neil Trini Lasrado
8521558f40
Workstation Doc Fixed
2015-02-11 14:58:43 +05:30
Neil Trini Lasrado
87402df56a
validations added to production order
2015-02-11 14:35:52 +05:30
Pratik Vyas
a9eae0b424
bumped to version 4.21.4
2015-02-11 13:37:59 +06:00
Nabin Hait
7945712171
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-11 12:55:10 +05:30
Nabin Hait
c3fc490d53
Merge pull request #2722 from nabinhait/fix1
...
minor fix in authorization rule
2015-02-11 12:25:16 +05:30
Nabin Hait
108e935744
minor fix in authorization rule
2015-02-11 12:24:45 +05:30
William Moreno
ad45007362
Add chart of accounts template for Nicaragua
...
On branch v5.0
new file: erpnext/accounts/doctype/account/chart_of_accounts/ni_ni_chart_template.json
2015-02-10 23:57:24 -06:00
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Pratik Vyas
e0a8f2d859
bumped to version 4.21.3
2015-02-09 19:04:23 +06:00
Nabin Hait
c5fb88c1cd
UOM validation for BOM Items
2015-02-09 16:48:02 +05:30
Pratik Vyas
6203cf7f04
bumped to version 4.21.2
2015-02-06 17:02:00 +06:00
Neil Trini Lasrado
845be908d6
function moved to validate
2015-02-06 16:15:45 +05:30
Neil Trini Lasrado
8fd3828ef5
Update Item Desc Button Removed from BOM, Item desc automatically updated in BOM on save of item master
2015-02-06 16:09:55 +05:30
Neil Trini Lasrado
11cd4f6c30
time log activity type made mandatory, new activity type manufacturing created
2015-02-06 16:06:45 +05:30
Neil Trini Lasrado
07a0d250ed
time log fixes
2015-02-06 16:06:14 +05:30
Neil Trini Lasrado
b744e16a83
Activity made compulsory for time_log_type Project
2015-02-06 16:05:34 +05:30
Neil Trini Lasrado
93638bd179
Time Log -
...
Project made compulsory for time logs with time_log_for selected as 'Project'
Activity Type Madetory criteria removed
Compleated Quantity hidden if time_log_for is not set as Manufacturing
2015-02-06 16:05:34 +05:30
Nabin Hait
e7cf961eaa
Merge pull request #2690 from neilLasrado/opportunity-status
...
fixes for #2655
2015-02-06 16:04:42 +05:30
Nabin Hait
4ed51416e5
Merge pull request #2656 from neilLasrado/po-capacity-planning
...
fixes for production order
2015-02-06 16:04:08 +05:30
Neil Trini Lasrado
47a62c623c
fixes for #2655
2015-02-06 15:51:20 +05:30
Nabin Hait
4ec5d5594b
Merge pull request #2696 from nabinhait/fix1
...
net_total and grand_total mismatch issue
2015-02-06 15:43:10 +05:30
Nabin Hait
a3cb828ed3
progress bar in item grid
2015-02-06 13:00:33 +05:30
Anand Doshi
e241569303
Allow non-english characters in Naming Series
2015-02-06 12:56:26 +05:30
Anand Doshi
9b30a8626c
[minor] removed default filters for sales order and material request, fixed pos css
2015-02-06 12:30:08 +05:30
Nabin Hait
5e13e0c316
net_total and grand_total mismatch issue
2015-02-05 17:18:03 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Pratik Vyas
43f627a83a
bumped to version 4.21.1
2015-02-05 16:14:06 +06:00
Anand Doshi
d0b3a3734e
Merge pull request #2693 from anandpdoshi/anand-feb-5
...
Fixed call to calculate
2015-02-05 15:25:25 +05:30
Nabin Hait
e0ce9407cb
divisional loss adjustment while doing gl entry for purchase receipt
2015-02-05 15:12:37 +05:30
Anand Doshi
dea3fb0d64
[fix] call calculate code only once after applying pricing rule
2015-02-05 15:06:16 +05:30
Pratik Vyas
fd654a06e8
bumped to version 4.21.0
2015-02-05 14:55:13 +06:00
Nabin Hait
5bf1f89da7
Merge pull request #2669 from nathando/patch-2
...
Look like a minor bug
2015-02-05 13:48:47 +05:30
Anand Doshi
dd942bb3d2
[minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists
2015-02-04 18:53:24 +05:30
Nabin Hait
1dc8ff5220
item-wise tax distribution if amount entered in actual
2015-02-04 18:06:59 +05:30
Rushabh Mehta
0e13221338
[print] item tables - override description and uom
2015-02-04 17:02:24 +05:30
Neil Trini Lasrado
59a706585c
actual start and end date made blank if islocal
2015-02-04 11:44:24 +05:30
Neil Trini Lasrado
de164c91e0
actual start and end date calculation - call moved to submit and cancel of Time Log
2015-02-04 11:35:10 +05:30
Neil Trini Lasrado
2017796de7
fixes in auto create time logs
2015-02-04 11:16:49 +05:30
Neil Trini Lasrado
a9b3ec180e
fixes for productiojn order
2015-02-04 11:16:49 +05:30
Rushabh Mehta
b736443e3f
[patch] [fix]
2015-02-04 10:40:02 +05:30
Nabin Hait
279bb6f3ed
Merge pull request #2628 from neilLasrado/batch-validation
...
Batch Validation
2015-02-03 18:33:49 +05:30
Neil Trini Lasrado
14e24a947b
fixes for batch validations
2015-02-03 18:23:46 +05:30
Neil Trini Lasrado
9448aaf2a6
validation added in stock entry
2015-02-03 18:09:56 +05:30
Neil Trini Lasrado
acbf185c1e
fixes
2015-02-03 18:07:34 +05:30
Neil Trini Lasrado
c8c67f7807
Bom operations and item link removed. Cost recalculated on removal of operation or rew material row.
2015-02-03 18:07:34 +05:30
Nabin Hait
44c0a741d1
Merge pull request #2672 from neilLasrado/batch-list-view
...
batch list view fix
2015-02-03 18:01:53 +05:30
Nabin Hait
c0c9023d27
Merge pull request #2653 from neilLasrado/bom-validations
...
Validations added to Bom Doctype.
2015-02-03 18:01:31 +05:30
Nabin Hait
bdc72e7e8b
Merge pull request #2613 from neilLasrado/bom-item-name
...
item name added to BOM
2015-02-03 18:01:10 +05:30
Nabin Hait
0c883500bb
Expense account query in purchase invoice
2015-02-03 17:59:00 +05:30
Nabin Hait
4ce020f521
Item grid header in print format
2015-02-03 17:59:00 +05:30
Rushabh Mehta
c567e8e960
[fix] analytics reports + remove print item tables #2667
2015-02-03 17:56:25 +05:30
Neil Trini Lasrado
75e0f0a153
batch list view fix:
2015-02-03 17:41:11 +05:30
Nabin Hait
11cb9de10a
Merge pull request #2670 from nabinhait/fix1
...
default target warehouse for subcontract
2015-02-03 14:34:34 +05:30
Neil Trini Lasrado
9257baa747
fixes in bom validations
2015-02-03 12:29:36 +05:30
Neil Trini Lasrado
f5be350eb4
Validations added to Bom Doctype.
2015-02-03 12:21:46 +05:30
Neil Trini Lasrado
7dac750ffe
patch fix
2015-02-03 10:59:40 +05:30
Neil Trini Lasrado
41acbff959
item name added to BOM
2015-02-03 10:59:40 +05:30
Do Le Bao Nguyen
f9b63dd36a
Look like a minor bug
...
- There is no frappe.get_default but only frappe.db.get_default ?
- Error return if selecting Employee in Salary Slip without specifying the Fiscal Year first
2015-02-03 11:10:09 +08:00
Nabin Hait
d2b762d760
Merge pull request #2617 from neilLasrado/sales-order
...
sales order - allow same item to enter multiple times. Throws warning
2015-02-02 16:44:12 +05:30
Nabin Hait
7e333c6a31
Merge pull request #2596 from neilLasrado/item-in-bom
...
allow bom field removed from Item Master
2015-02-02 16:33:46 +05:30
Nabin Hait
4b4598e5cb
Merge pull request #2594 from neilLasrado/bom-item-update
...
bom - button added to update item desc.
2015-02-02 16:30:58 +05:30
Neil Trini Lasrado
809abdf295
lead report - state, country and pincode seprated from address
2015-02-02 11:43:56 +05:30
Rushabh Mehta
052bd624c1
[minor] removed company description and don't call apply_price_list if no items
2015-01-30 16:57:24 +05:30
Anand Doshi
aff9a59f2d
[minor] removed pscript from Feature Setup, made Activity Type as mandator in Time Log
2015-01-29 19:49:34 +05:30
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Nabin Hait
79dc136d50
default target warehouse for subcontract
2015-01-29 12:51:17 +05:30
Pratik Vyas
276053b35f
bumped to version 4.20.2
2015-01-28 17:31:56 +06:00
Nabin Hait
f6f2fc4079
Print format: show item table header as per meta label
2015-01-28 16:45:13 +05:30
Nabin Hait
238fd68803
Minor fix
2015-01-28 14:30:03 +05:30
Nabin Hait
22a4b82bd2
Minor fixes
2015-01-28 13:11:49 +05:30
Pratik Vyas
408a8e804c
bumped to version 4.20.1
2015-01-27 15:13:53 +06:00
Anand Doshi
e0b39b860f
Merge pull request #2640 from anandpdoshi/anand-jan-27
...
Fixes to Error Reports
2015-01-27 14:33:12 +05:30
Anand Doshi
6f701b3b6a
[minor] Packing Slip get_query
2015-01-27 13:18:01 +05:30
Anand Doshi
8147f74e4e
[minor] Mandatory filters in Customer Acquisition and Loyalty
2015-01-27 13:16:18 +05:30
Neil Trini Lasrado
dc65dc3778
rename patch
2015-01-27 12:27:10 +05:30
Neil Trini Lasrado
81b98261ae
patch fix
2015-01-27 11:28:56 +05:30
Nabin Hait
538253e503
removed test files for purchase taxes and charges master
2015-01-23 17:47:44 +05:30
Nabin Hait
ecce5141eb
replaced budget distribution
2015-01-23 16:32:35 +05:30
Nabin Hait
d41f3c1f5e
All the calculations in taxes_and_totals file
2015-01-23 16:24:49 +05:30
Pratik Vyas
e4c2ebfc57
bumped to version 4.20.0
2015-01-23 16:46:53 +06:00
Neil Trini Lasrado
40a9f6f8e9
patch fix
2015-01-23 15:32:35 +05:30
Neil Trini Lasrado
f0b0464cce
patch for is_batch_item
2015-01-23 15:32:35 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Nabin Hait
4ccd8d3326
Allow nagative batch balance from landed cost voucher
2015-01-23 12:18:14 +05:30
Nabin Hait
b4a3dfa893
All the calculations in taxes_and_totals file
2015-01-22 17:13:13 +05:30
Anand Doshi
88a1515b46
[minor] ERPNext as navbar-home
2015-01-21 18:25:04 +05:30
Nabin Hait
59de1e23bc
POS fix: setting discount amount
2015-01-21 17:50:28 +05:30
Nabin Hait
963393409e
minor fix: child table length
2015-01-21 17:22:11 +05:30
Pratik Vyas
d33a3a295f
bumped to version 4.19.0
2015-01-21 17:35:29 +06:00
Nabin Hait
0a3e5653ba
bank reconciliation fix
2015-01-21 16:40:47 +05:30
Nabin Hait
9c47efb592
Landed cost voucher: allow negative stock while doing cancellation entry for purchase receipts
2015-01-21 16:22:45 +05:30
Neil Trini Lasrado
f108c2df72
sales order - allow same item to enter multiple times. Throws warning
2015-01-21 14:33:49 +05:30
Nabin Hait
ea61046e8d
Updated Quotation Status
2015-01-21 14:08:06 +05:30
Nabin Hait
3f671ea60f
Landed Cost Voucher: Add field and fixed reposting issue
2015-01-21 14:08:06 +05:30
Pratik Vyas
d1225661d2
Translation updates
2015-01-21 12:05:45 +05:30
Rushabh Mehta
71a6b93d89
[cleanups]
2015-01-19 17:35:05 +05:30
Rushabh Mehta
81e972eac4
[cleanups]
2015-01-19 17:34:54 +05:30
Neil Trini Lasrado
26b01f7852
fixes
2015-01-19 17:18:43 +05:30
Neil Trini Lasrado
f1f0a8ac19
bom - button added to update item desc.
2015-01-19 17:11:32 +05:30
Rushabh Mehta
302eee9406
Merge pull request #2463 from Steggur/develop
...
first is translation commit
2015-01-19 17:08:53 +05:30
Neil Trini Lasrado
c784fa219b
commit
2015-01-19 17:05:05 +05:30
Neil Trini Lasrado
f37a5ddff5
allow bom field removed from Item Master
2015-01-19 17:05:05 +05:30
Anand Doshi
938ed1a57d
[minor] fixed patch update_companywise_payment_account
2015-01-19 16:20:26 +05:30
Anand Doshi
f02e142d5d
[design] mobile
2015-01-19 15:59:45 +05:30
Anand Doshi
b942cb86ae
[minor] auto-create Fiscal Year, loading, general ledger
2015-01-19 15:59:45 +05:30
Nabin Hait
cff8993478
Merge pull request #2572 from neilLasrado/credit-note
...
journal entry linked with Stock Entry
2015-01-19 14:26:58 +05:30
Nabin Hait
9ef2e78905
Merge pull request #2553 from neilLasrado/mode-of-payment
...
mode of payment - company wise default account added
2015-01-19 14:26:00 +05:30
Nabin Hait
aabeb38c15
minor fix
2015-01-19 11:07:32 +05:30
Nabin Hait
fe93ea56b6
Minor fixes: escaped characters
2015-01-19 11:07:32 +05:30
Pratik Vyas
d7ba759844
bumped to version 4.18.1
2015-01-17 02:12:05 +06:00
Nabin Hait
dd4617d30f
Opportunity From field is mandatory
2015-01-16 15:08:00 +05:30
Nabin Hait
6609938483
Removed validation: target_valuation > source_valuation
2015-01-16 11:59:47 +05:30
Nabin Hait
84662f2db5
minor fix in payment receipt voucher print format
2015-01-16 11:59:47 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Nabin Hait
239c2c327c
Hide currency and price list section after submission
2015-01-15 14:22:04 +05:30
Nabin Hait
45a5d52a2a
minor changes in packing slip
2015-01-15 14:22:04 +05:30
Rushabh Mehta
5293aa7ca0
[ui] setup wizard
2015-01-15 12:07:02 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
f2b1f2658d
patch fix
2015-01-14 12:06:20 +05:30
Neil Trini Lasrado
bd2ac2f51f
mode of payment - company wise default account added
2015-01-14 12:00:17 +05:30
Neil Trini Lasrado
9235c6d65a
update stock_entry.py
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
50763d58ce
frappe.db.exist used
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
adfdd6f83c
journal entry linked and validation added
2015-01-14 11:54:55 +05:30
Nabin Hait
f34c96bf7a
minor fix
2015-01-14 11:49:04 +05:30
Pratik Vyas
991962b6fd
bumped to version 4.18.0
2015-01-14 12:12:45 +06:00
Nabin Hait
c481e27d88
Merge pull request #2565 from alexandre-00/patch-11
...
Update bom.py
2015-01-14 11:39:08 +05:30
Nabin Hait
0bcf3e307c
Merge pull request #2579 from neilLasrado/jv-fix
...
Journal entries recalc totals on del of accounts table row
2015-01-14 11:27:25 +05:30
Neil Trini Lasrado
73cad76010
dirty code cleanup
2015-01-13 13:55:34 +05:30
Neil Trini Lasrado
e3e3a56b5c
Journal entries recalc totals on del of accounts table row
2015-01-13 12:33:15 +05:30
Nabin Hait
2244ac4d52
Discount amount in party currency
2015-01-12 17:35:37 +05:30
Nabin Hait
024b537b7f
Merge pull request #2557 from neilLasrado/spelling-of-approver
...
Spelling Correction - Leave application #2552
2015-01-12 17:02:10 +05:30
Neil Trini Lasrado
0866272ba1
get fiscal year fix
2015-01-12 16:41:55 +05:30
Rushabh Mehta
135fe3405f
[ui] listviews
2015-01-12 16:11:02 +05:30
Pratik Vyas
47a10f5a39
bumped to version 4.17.0
2015-01-12 12:44:35 +06:00
Nabin Hait
39c8c9e7b0
Fixes in print format css
2015-01-12 11:04:07 +05:30
Nabin Hait
4e7cc93af9
minor fix in reposting utility
2015-01-12 10:55:48 +05:30
Nabin Hait
873d98be2d
create material request from production planning tool
2015-01-11 22:01:59 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +05:30
Nabin Hait
675276b802
valuation rate mandatory if item is transacting for the first time
2015-01-10 10:27:28 +05:30
alexandre-00
3ed3a2d176
Update bom.py
...
removed the attrgetter
2015-01-09 14:42:27 +08:00
Rushabh Mehta
9e95e780da
Merge pull request #2560 from neilLasrado/test-fix
...
opportunity - test records fixed
2015-01-09 12:03:28 +05:30
alexandre-00
de58657537
Update bom.py
...
Hi guys,
Just a proposal to sort the Materials Required (Exploded) from the BOM.
So the items and sub-assemblies items looks a little bit more organized in the list.
Cheers
Alexandre
2015-01-09 14:20:43 +08:00
Anand Doshi
015fa7a1d1
[fix] escape quote in Accounts Receivable
2015-01-08 18:26:53 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
1ff3a6cdb8
fix
2015-01-07 16:24:52 +05:30
Nabin Hait
7778b480fd
fix reposting gl entries for future vouchers
2015-01-07 15:45:10 +05:30
Neil Trini Lasrado
a17d7cea34
test records fixed
2015-01-07 15:42:59 +05:30
Anand Doshi
7b34ebe89d
[minor] Translated status change comment
2015-01-07 15:41:47 +05:30
Pratik Vyas
bdfd0d1ff9
bumped to version 4.16.0
2015-01-07 12:07:22 +06:00
Nabin Hait
6c1773025b
fiscal year error message
2015-01-07 11:33:14 +05:30
Neil Trini Lasrado
1b7d66fab6
Update leave_application.js
2015-01-07 11:16:41 +05:30
Rushabh Mehta
738d4ef5c8
[ui] [listviews] indicators
2015-01-06 18:09:02 +05:30
Anand Doshi
50d7e8cf8f
[design] Point of Sale
2015-01-06 17:14:26 +05:30
Nabin Hait
e24365f1f4
message fix
2015-01-06 12:57:23 +05:30
Rushabh Mehta
e1cb0ae738
[design] list views
2015-01-05 17:39:05 +05:30
Anand Doshi
9b955feff8
[design] POS - item grid and taxes
2015-01-05 16:19:12 +05:30
Nabin Hait
5515b1ea7f
minor fix
2015-01-05 08:18:15 +05:30
Nabin Hait
8a00319962
minor fix
2015-01-04 17:27:40 +05:30
Nabin Hait
0938b5dec6
FG item and raw material can not be merged
2015-01-02 15:12:30 +05:30
Rushabh Mehta
ff58261407
[icons] mfg and shopping cart
2015-01-02 14:40:48 +05:30
Nabin Hait
f40ce616a7
In stock entry, difference account can be non-profit-and-loss account
2015-01-02 14:37:01 +05:30
Nabin Hait
ebc4ae7892
patch fixes
2015-01-02 12:46:49 +05:30
Anand Doshi
3f5e95a99e
[design] Fixed Grid Reports
2015-01-01 16:26:18 +05:30
Rushabh Mehta
90e270a8aa
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:40 +05:30
Rushabh Mehta
4c36d7388c
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:34 +05:30
Nabin Hait
56ac3fb29d
some fixes for renaming patch
2015-01-01 13:40:54 +05:30
Rushabh Mehta
bfaf0a8f43
[tree] [ui]
2015-01-01 12:49:18 +05:30
Rushabh Mehta
7a8f009116
[fixes]
2014-12-31 15:34:37 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Rushabh Mehta
ee4b8bee33
Revert "[patches] removed 4.0 patches"
...
This reverts commit 6f7cba8d73
.
2014-12-31 15:01:48 +05:30
Rushabh Mehta
7b822abcd6
[desktop] new icons
2014-12-31 14:42:23 +05:30
Nabin Hait
cbdfb767a9
patch fix
2014-12-31 13:30:36 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Pratik Vyas
b094ee45d7
bumped to version 4.15.4
2014-12-31 13:11:14 +06:00
Nabin Hait
5604f987f2
item validation in bom
2014-12-31 12:37:11 +05:30
Nabin Hait
a4e547d71d
minor fix
2014-12-31 12:08:13 +05:30
Nabin Hait
a74468b353
set missing cost center using default
2014-12-30 18:33:52 +05:30
Rushabh Mehta
afbfdcf552
[ui] minor fixes
2014-12-30 18:11:32 +05:30
Nabin Hait
40431cbf89
focus on barcode field after adding a row
2014-12-30 17:53:16 +05:30
Nabin Hait
54c31b498b
Fixes in Stock Analytics
2014-12-30 16:33:07 +05:30
Nabin Hait
7d8fa8089a
always calculate taxes and totals onchange of exchange rate
2014-12-30 15:35:59 +05:30
Pratik Vyas
ecc3f312b9
bumped to version 4.15.3
2014-12-28 17:29:08 +06:00
Nabin Hait
dd38a266b8
Removed tname and fname from code
2014-12-26 13:15:21 +05:30
Rushabh Mehta
a5b149c061
[design] module pages, messages, timelines
2014-12-26 12:53:02 +05:30
Rushabh Mehta
4096a3ab2b
[design] form toolbar
2014-12-26 12:53:02 +05:30
Rushabh Mehta
6f7cba8d73
[patches] removed 4.0 patches
2014-12-26 12:53:01 +05:30
Rushabh Mehta
a9ba5eff99
[design] pos
2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe
field renaming
2014-12-26 11:41:15 +05:30
Nabin Hait
c3270d7504
exchange_rate no_copy fix
2014-12-26 10:58:58 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
2eed5a35e3
fixed capacilty planning patch
2014-12-24 10:41:55 +05:30
Pratik Vyas
f64d11da3c
bumped to version 4.15.2
2014-12-23 19:41:08 +06:00
Nabin Hait
0741ed3a82
Merge pull request #2472 from neilLasrado/expense-claim
...
New feature for issue #2419
2014-12-23 18:07:38 +05:30
Nabin Hait
57595cf73b
fixed merge conflict
2014-12-23 18:05:13 +05:30
Neil Trini Lasrado
31a92bd9d9
company wise letter head feature added
2014-12-23 17:52:41 +05:30
Nabin Hait
b0b7e7fdf8
Merge pull request #2497 from neilLasrado/batch-redesign
...
batch redesigned
2014-12-23 17:44:41 +05:30
Nabin Hait
95225be93d
Merge pull request #2509 from pdvyas/fix-patches
...
add reload_doc in a few patches
2014-12-23 17:43:52 +05:30
Nabin Hait
89c52eacc7
Actual operation cost in stock entry, fixed cost removed from bom and workstation
2014-12-23 17:39:00 +05:30
Nabin Hait
0de6256bcc
time log and workstations
2014-12-23 17:39:00 +05:30
Nabin Hait
0f4350dd61
capacity planning fixes and cleanup
2014-12-23 17:39:00 +05:30
Nabin Hait
1fa7171bfa
minor fixes
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
41781ce686
test case fix - holiday list
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
9712e7dad4
holiday logic removed
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
e84fa67f30
Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
...
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
5ec7542519
Holiday List name changed and workstation filter added to time log
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
812cd8a8ce
Prod Order Form Modified
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd
Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log
2014-12-23 17:38:59 +05:30
Nabin Hait
e5d169b8d2
Merge pull request #2521 from nabinhait/fix1
...
fixed negative batch wty message
2014-12-23 11:26:04 +05:30
Nabin Hait
da4e3fb366
fixed negative batch wty message
2014-12-23 10:58:01 +05:30
Nabin Hait
13ce150149
Merge pull request #2520 from nabinhait/fix1
...
minor fix no-copy
2014-12-22 15:07:28 +05:30
Nabin Hait
a04489a72b
minor fix no-copy
2014-12-22 14:58:36 +05:30
Pratik Vyas
ff56566506
bumped to version 4.15.1
2014-12-22 11:47:45 +06:00
Nabin Hait
cfe3c54ca0
Dont reset pricing if ignore pricing rule
2014-12-22 10:43:10 +05:30
Pratik Vyas
5d1543f241
bumped to version 4.15.0
2014-12-19 18:43:55 +06:00
Nabin Hait
cb11f27558
Customer should not copied from lead to opoortunity
2014-12-19 10:51:59 +05:30
Anand Doshi
ca2c297f72
[fix] In Setup Wizard, load languages from languages.txt
2014-12-18 17:31:21 +05:30
Pratik Vyas
0a726e2335
add reload doc to patch
2014-12-18 12:41:09 +05:30
Pratik Vyas
387e1e21cb
add reload_doc in a few patches
2014-12-18 11:36:23 +05:30
Pratik Vyas
dc2630b7fa
Make Tax Assets a group in standard chart of accounts
2014-12-17 16:23:51 +05:30
Nabin Hait
f4ec673a06
Merge pull request #2488 from neilLasrado/bom-currency-fix
...
Bom Currency Fix
2014-12-17 15:42:13 +05:30
Nabin Hait
49a2729663
Reapply price list if pricing rule reset as blank
2014-12-17 11:24:00 +05:30
Pratik Vyas
13553c2bf0
bumped to version 4.14.0
2014-12-16 16:17:06 +06:00
Nabin Hait
e4c659386a
packing list index
2014-12-16 15:16:55 +05:30
Nabin Hait
6ffa445dfd
minor fixes in coa templates
2014-12-16 12:49:35 +05:30
Nabin Hait
b072c74efc
render address and contacts for party
2014-12-16 12:49:13 +05:30
Anand Doshi
cd7a1661c6
Merge pull request #2498 from anandpdoshi/anand-dec-15
...
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-16 12:42:40 +05:30
Nabin Hait
7eedebc970
Fecth contact details on change of contact in purchase transactions
2014-12-16 11:56:21 +05:30
Nabin Hait
0f2137be18
no copy property for customer's po no
2014-12-16 10:37:55 +05:30
Anand Doshi
f87a622ef0
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-15 23:14:35 +05:30
Neil Trini Lasrado
26320fc755
batch redesigned
2014-12-15 17:42:33 +05:30
Nabin Hait
3cd7a45c1b
Translation fixes
2014-12-15 14:56:58 +05:30
Nabin Hait
b2a84c7cd9
modified date updated in supplier.json
2014-12-15 14:22:14 +05:30
Nabin Hait
606af96c9f
minor fix
2014-12-15 11:57:19 +05:30
Nabin Hait
90b5174256
minor fix
2014-12-15 11:48:43 +05:30
Pratik Vyas
a578f3e23a
bumped to version 4.13.1
2014-12-12 17:22:09 +06:00
Neil Trini Lasrado
1d66b71464
patch fix
2014-12-12 14:48:30 +05:30
Neil Trini Lasrado
e1f21682fb
changes made
2014-12-12 13:09:42 +05:30
Nabin Hait
ad0bd4ca92
Pull all customer's po no in delivery note when made from multiple sales order
2014-12-12 12:49:45 +05:30
Neil Trini Lasrado
cc73999497
validate fixed
2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
f13c4f0145
New feature for issue #2419
2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
8d34417c44
Bom currency feilds changed to type currency and company feild added to BOM
2014-12-12 11:33:50 +05:30
Nabin Hait
4b83403a63
Fixed bom patch
2014-12-12 11:28:58 +05:30
Nabin Hait
a94478a618
Merge pull request #2390 from ankitjavalkarwork/fix2314
...
Add selectable BOM field for Subcontracted Item
2014-12-11 17:41:45 +05:30
Nabin Hait
abfc72ded4
Merge pull request #2450 from ankitjavalkarwork/fix2363
...
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-11 17:40:54 +05:30
Nabin Hait
4f7c51d68e
Merge pull request #2442 from ankitjavalkarwork/gross-profit
...
Gross profit
2014-12-11 17:37:54 +05:30
Neil Trini Lasrado
6ddc487fb6
patch fix
2014-12-11 17:33:41 +05:30
Nabin Hait
a870d540b5
Merge pull request #2458 from neilLasrado/bom-redesign
...
BOM doctype design modified. Quality feild moved from 'More Section' to ...
2014-12-11 17:25:58 +05:30
Nabin Hait
1656839c1b
Merge pull request #2459 from neilLasrado/PO-status-indicator
...
Fix for "Stopped" status indicator in Purchase Order List View
2014-12-11 17:25:22 +05:30
Neil Trini Lasrado
3a34cadcb2
Fix - Total Fixed Cost with patch
2014-12-11 17:15:12 +05:30
Nabin Hait
bef80bab0d
Removed gross profit field from sales invoice
2014-12-11 16:27:18 +05:30
Nabin Hait
5cafcf66b0
Leave application fix
2014-12-10 23:59:04 +05:30
Nabin Hait
35ebe1bf78
Tax amount in POS invoice print format
2014-12-10 12:42:32 +05:30
Nabin Hait
b14cc0417d
Display tax amount after discount, if there is any discount amount
2014-12-10 12:28:25 +05:30
Neil Trini Lasrado
c0063a6e74
sales Invoice- filter added for debit to
2014-12-09 17:03:13 +05:30
Pratik Vyas
c8f5c3cdbe
bumped to version 4.13.0
2014-12-09 17:10:28 +06:00
Nabin Hait
690bcd7b66
Added leave approver name field in leave application
2014-12-09 16:36:33 +05:30
Nabin Hait
7887ccb441
Credit days fix
2014-12-09 14:34:14 +05:30
Nabin Hait
d57b57a21d
Minor fix in accounts receivable report
2014-12-09 11:56:13 +05:30
erp
9fc0a8cbf8
first is translation commit
2014-12-05 11:17:44 +00:00
ankitjavalkarwork
5edae0e47b
[ #2314 ] Add selectable BOM field for Subcontracted Item
2014-12-04 15:54:54 +05:30
Neil Trini Lasrado
355dfe52ab
Fix for "Stopped" status indicator in Purchase Order List View
...
Issue #2368
2014-12-04 13:34:27 +05:30
ankitjavalkarwork
35db282765
Fix gross_profit.py, commonify and add elementwise grouping to report
2014-12-04 13:08:42 +05:30
Neil Trini Lasrado
c73f4f70e4
BOM doctype design modified. Quality feild moved from 'More Section' to 'Materials Section'
...
[fix] Issue #2404
2014-12-04 12:42:23 +05:30
Rushabh Mehta
ec9db4b799
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
Rushabh Mehta
969069fbf9
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
Rushabh Mehta
9f32a50379
[merge] fix
2014-12-03 12:35:19 +05:30
ankitjavalkarwork
c41a0e2e38
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-02 15:13:36 +05:30
Nabin Hait
5cc0531d27
Merge pull request #2451 from revant/develop
...
"From time" cannot be later than "To time" and hours cannot be negative
2014-12-02 14:27:00 +05:30
Revant Nandgaonkar
b80d892eab
removed unecessary backslash
2014-12-02 14:19:29 +05:30
Nabin Hait
eca7e22cda
Shopping cart test fixed
2014-12-02 11:35:29 +05:30
Nabin Hait
abcbbc63d8
Merge pull request #2435 from nabinhait/fix1
...
Fixes in authorization rule based on average discount
2014-12-02 10:36:25 +05:30
Nabin Hait
6871c74ce1
Merge pull request #2444 from ankitjavalkarwork/contactmob
...
Display mobile no. of contact
2014-12-02 10:35:46 +05:30
Revant Nandgaonkar
d0a44ca85c
Changed contact_date to Datetime so appointment or call with time can be scheduled
2014-12-01 23:31:53 +05:30
Revant Nandgaonkar
83db3e3ddb
"From time" cannot be later than "To time" and hours cannot be negative
2014-12-01 16:53:29 +05:30
Nabin Hait
cc11045fd3
minor fix
2014-11-28 16:59:32 +05:30
Nabin Hait
1b5afe737f
Fixes in authorization rule based on average discount
2014-11-28 16:59:32 +05:30
Rushabh Mehta
3d65d9602e
[error-reports]
2014-11-28 14:58:43 +05:30
Rushabh Mehta
1913d5b366
[series] for Issue
2014-11-28 14:27:46 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
Rushabh Mehta
bd9b62ff28
[rename] Support Ticket -> Issue
2014-11-28 11:46:10 +05:30
Nabin Hait
1caa1a3708
Fixed party model patch
2014-11-28 11:26:35 +05:30
ankitjavalkarwork
9440d080d4
Print Hide Recurring Order/Invoice based fields
2014-11-27 17:28:53 +05:30
ankitjavalkarwork
9269c86339
Display mobile no of contact
2014-11-27 17:13:36 +05:30
Nabin Hait
789b74257e
test case fixes
2014-11-27 15:22:24 +05:30
Nabin Hait
40fffc0f4d
fixes during testing version 5
2014-11-26 15:43:27 +05:30
Nabin Hait
249bbbc56f
fixes during testing version 5
2014-11-26 15:35:39 +05:30
Nabin Hait
9ed41b3abb
Reordered Item fields
2014-11-26 10:54:11 +05:30
Pratik Vyas
f227379d2f
bumped to version 4.12.0
2014-11-25 11:46:33 +06:00
Nabin Hait
6141b80704
Merge pull request #2414 from ankitjavalkarwork/fix1738
...
[#1738 ] Required Date field in po_details auto-copied in all rows
2014-11-25 10:57:15 +05:30
Nabin Hait
eba88919c1
Merge pull request #2431 from mayur-patel/patch-2
...
Update leave_application.py : Modified get_holidays function
2014-11-25 10:55:11 +05:30
Rushabh Mehta
3408432b50
Merge pull request #2428 from rmehta/translations-update
...
[translations] updated via frappe.io/translator
2014-11-25 10:54:36 +05:30
Rushabh Mehta
a0949158b7
[translations] updated via frappe.io/translator
2014-11-25 10:53:12 +05:30
Nabin Hait
ea91d2aaf1
Merge pull request #2429 from ankitjavalkarwork/expclaimname
...
Add configurable naming series to Expense claim
2014-11-25 10:51:03 +05:30
Rushabh Mehta
de992abf83
Merge pull request #2413 from Delte/patch-1
...
Update tr.csv
2014-11-25 10:49:51 +05:30
Mayur Patel
5d8635a8dc
Update leave_application.py
...
See issue #2422 for more detail.
2014-11-24 16:57:53 +00:00
ankitjavalkarwork
7e911bae95
Add configurable naming series to Expense claim
2014-11-24 18:26:17 +05:30
Nabin Hait
b74ae7aa31
Minor fix for order to invoice mapping
2014-11-24 18:17:01 +05:30
Nabin Hait
0ad7db3bbd
Minor fix in salary slip net total calculation
2014-11-24 15:25:13 +05:30
Nabin Hait
db74e316d2
Validate serial no after auto-creation based on naming series
2014-11-24 15:25:13 +05:30
Nabin Hait
1897360e4b
Set default language as English in setup wizard
2014-11-24 15:25:13 +05:30
Rushabh Mehta
2f4567fa3c
[minor] [ux] address refresh for lead
2014-11-24 15:18:40 +05:30
Rushabh Mehta
0a7abc188e
[minor] [ux] contact template
2014-11-24 15:06:40 +05:30
Rushabh Mehta
5eeef7f065
[refactor] address and contact list in customer, supplier, lead, sales person
2014-11-24 14:16:51 +05:30
Rushabh Mehta
7d36875d6f
[refactor] address and contact list in customer, supplier, lead, sales person
2014-11-24 14:16:47 +05:30
Pratik Vyas
85a354f2fb
fix Mailbox migration patch
2014-11-20 11:41:30 +05:30
ankitjavalkarwork
15ea5cc972
[ #1738 ] Required Date field in po_details auto-copied in all rows
2014-11-17 13:26:43 +05:30
Delte
2fa718705a
Update tr.csv
...
Typo & translation fix
2014-11-15 22:39:25 +02:00
Nabin Hait
707322adb9
Fixes for standard chart of accounts
2014-11-14 18:13:33 +05:30
Nabin Hait
601fcde31c
Merge pull request #2383 from neilLasrado/pos
...
POS feature #2305
2014-11-14 18:12:26 +05:30
Nabin Hait
40c47b2236
Merge pull request #2395 from ankitjavalkarwork/fix2230
...
[#2230 ] Add Totals row to Gross Profit report
2014-11-14 18:06:19 +05:30
Nabin Hait
f8b7633c63
Merge pull request #2398 from ankitjavalkarwork/fix2179
...
Delete events linked with employee on deletion of Employee
2014-11-14 18:05:11 +05:30
Nabin Hait
0bff25c7cb
Merge pull request #2401 from ankitjavalkarwork/fix2219
...
[#2219 ] Re-Order Level Validation: Warehouse cannot have two reorders for same item
2014-11-14 18:04:07 +05:30
Pratik Vyas
2277922313
bumped to version 4.11.2
2014-11-14 15:57:34 +06:00
Nabin Hait
aa5deaa070
minor fix
2014-11-14 15:19:07 +05:30
Nabin Hait
6b5d51ca22
Merge pull request #2402 from jorxzpagta/patch-1
...
Update supplier.js [Displaying Messages on the Communation History]
2014-11-14 15:05:11 +05:30
Nabin Hait
2c114b5bb5
Merge pull request #2407 from ankitjavalkarwork/packingsliphead
...
Add letterhead field and mapper in Packing Slip
2014-11-14 14:50:28 +05:30
Nabin Hait
ccd9fd3e94
Rounding in totals calculation
2014-11-14 14:27:24 +05:30
ankitjavalkarwork
fff1b42f80
Fix Error message, add account_type to 'inventories' in Chart Of Acc.
2014-11-14 14:19:06 +05:30
Nabin Hait
4215b3afc3
temporary fix in payment tool
2014-11-14 10:51:31 +05:30
ankitjavalkarwork
f60f111afe
Add letterhead field and mapper in Packing Slip
2014-11-13 17:28:42 +05:30
Nabin Hait
a6a70a5f35
Make email account patch
2014-11-12 17:00:42 +05:30
jorxzpagta
6fe0a3cee3
Update supplier.js
...
Display Messages on the Communication History
2014-11-12 17:02:06 +08:00
Nabin Hait
4cd60d7d61
Included standard charts in json format
2014-11-12 14:29:44 +05:30
Nabin Hait
4963ac2af5
charts for brazil
2014-11-12 14:29:44 +05:30
Nabin Hait
f3d7ef3a1b
Chart of accounts name cleanup
2014-11-12 14:29:44 +05:30
Nabin Hait
ed9c26db4d
Show only active and enabled charts for any country
2014-11-12 14:29:44 +05:30
Neil Trini Lasrado
737cedaeef
Required modifications done
2014-11-11 16:52:34 +05:30
Neil Trini Lasrado
2c388f9d7e
POS feature #2305
2014-11-11 16:00:09 +05:30
ankitjavalkarwork
338eb36811
[ #2219 ] Re-Order Level Validation: Warehouse cannot have two reorders for same item
2014-11-11 13:59:46 +05:30
Nabin Hait
f004077734
Map only pending qty from Material Request to Purchase Order/Stock Entry
2014-11-11 10:51:41 +05:30
ankitjavalkarwork
16e2c18c64
Delete events linked with employee on deletion of Employee
2014-11-10 18:08:23 +05:30
Nabin Hait
6c1011df92
Reference / Cheque date is after due date
2014-11-10 14:57:53 +05:30
Pratik Vyas
b5b821363d
bumped to version 4.11.1
2014-11-10 13:08:45 +06:00
ankitjavalkarwork
bd8a8b9bd7
[ #2230 ] Add Totals row to Gross Profit report
2014-11-10 12:36:43 +05:30
Nabin Hait
399afc87ef
Merge pull request #2379 from nathando/develop
...
Remove get_server_field from leave_application
2014-11-10 12:05:40 +05:30
Nabin Hait
012cc2cfe1
Merge pull request #2329 from neilLasrado/material-issue
...
Material Issue added to Material Request #2320
2014-11-10 12:04:01 +05:30
Nabin Hait
d795dfd8de
Credit days validation fixes
2014-11-10 11:39:55 +05:30
Nabin Hait
bf836277f9
Payment tool fix: get outstanding sales orders
2014-11-10 11:28:25 +05:30
Nabin Hait
10d1806d81
Credit days validation fixes
2014-11-10 11:11:58 +05:30
Pratik Vyas
4948d336c4
bumped to version 4.11.0
2014-11-06 15:06:51 +06:00
Nabin Hait
7f5bb1c8aa
Translation fixed for Croatia
2014-11-06 12:51:27 +05:30
Neil Trini Lasrado
6bde5868a9
Test Cases Fixed
2014-11-05 16:34:02 +05:30
Neil Trini Lasrado
6d8f48ff8d
Test Cases Added - Work Pending
2014-11-05 15:57:06 +05:30
Neil Trini Lasrado
f9ced8f28f
test-cases added
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
67e9081bbf
required modifications done
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
ce020cfb27
mapper added, type 'Transfer' renamed to 'Material Transfer', patch added
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
f24407e119
Material Issue added to Material Request Type
2014-11-05 15:46:32 +05:30
Pratik Vyas
e9b4686fec
bumped to version 4.10.0
2014-11-05 14:45:47 +06:00
Nabin Hait
ae1dcabcb5
Fixed merge conflict
2014-11-05 12:41:02 +05:30
Nabin Hait
5086ef2499
Update update_requested_and_ordered_qty.py
2014-11-05 12:33:29 +05:30
Nabin Hait
4a4125b3f4
Merge pull request #2377 from ankitjavalkarwork/apsumm
...
[#2362 ] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary
2014-11-05 11:47:03 +05:30
Nabin Hait
f73a7c1d17
Merge pull request #2376 from ankitjavalkarwork/fix2287
...
Delete Item Price on deletion of linked Item
2014-11-05 11:44:18 +05:30
Nathan Do
8a55d9a795
Remove get_server_field from leave_application
...
- Make get_holidays and get_total_leave_days global to module
- Replace get_server_field with using whitelisted function
get_total_leave_days
2014-11-05 12:32:57 +08:00
Nabin Hait
9114c26857
Patch to recalculate requested qty and ordered qty for all items
2014-11-04 15:34:03 +05:30
Nabin Hait
941a965af4
Ordered qty calculation logic
2014-11-04 15:34:03 +05:30
Nabin Hait
4acd431b92
Requested qty calculation logic
2014-11-04 15:34:03 +05:30
Nabin Hait
fad0d566f9
Payment receipt voucher print format fixed
2014-11-04 15:34:03 +05:30
ankitjavalkarwork
e6e65b0907
[ #2362 ] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary Report
2014-11-04 14:40:33 +05:30
Pratik Vyas
b9ce1f590b
bumped to version 4.9.3
2014-11-03 16:34:29 +06:00
ankitjavalkarwork
a03eda54a2
Delete Item Price on deletion of linked Item
2014-11-03 16:00:28 +05:30
Nabin Hait
36463ed790
Merge pull request #2375 from nabinhait/fix1
...
Check credit limit only if customer debited
2014-11-03 15:55:03 +05:30
Nabin Hait
3c8838816d
Check credit limit only if customer debited
2014-11-03 15:49:29 +05:30
Nabin Hait
7b3543caaf
Check credit limit only if customer debited
2014-11-03 15:46:15 +05:30
Nabin Hait
98050e7646
default receivable / payable accounts in company
2014-11-03 15:46:15 +05:30
Nabin Hait
f09667884b
Root type indentified for multiple country's chart
2014-11-03 15:46:15 +05:30
Nabin Hait
aed3fc48ba
Add default party accounts in customer/supplier
2014-11-03 15:46:15 +05:30
Nabin Hait
0d421c1bf1
Minor fixes
2014-11-03 15:46:15 +05:30
Nabin Hait
11e50a8eee
Merge pull request #2366 from ankitjavalkarwork/fixprinthideamt
...
Hide totals in DN, Auto set Bank/Cash acc. in JV
2014-11-03 15:38:45 +05:30
Nabin Hait
5288bdeabb
Minor fix
2014-11-03 15:08:21 +05:30
ankitjavalkarwork
f5804438bb
Auto set default bank/cash account on select of Bank/Cash Voucher in JV
2014-11-03 12:23:55 +05:30
ankitjavalkarwork
6e06357dc5
Hide totals on checking print_without_amount field in DN
2014-11-03 11:57:44 +05:30
Nabin Hait
28913b97b0
[fix] Null issue fixed in stock analytics report
2014-10-31 14:46:25 +05:30
Rushabh Mehta
98ae5bd9db
[form] show website link for website generator
2014-10-31 14:28:47 +05:30
Nabin Hait
e6370860a0
accounts receivable summary report cleanup
2014-10-30 15:54:40 +05:30
Nabin Hait
0822dcbde6
get query for bank/cash account
2014-10-30 15:54:40 +05:30
Nabin Hait
7dbcee87af
AR/AP report cleanup
2014-10-30 15:54:39 +05:30
Nabin Hait
99be941e7b
Party is only relevant to receivable/payable account
2014-10-30 15:54:39 +05:30
ankitjavalkarwork
574e55788f
[ #1379 ] Add Accounts Receivable Summary Report
2014-10-30 15:54:39 +05:30
ankitjavalkarwork
e63432db63
Commonify AR and AP reports
2014-10-30 15:54:39 +05:30
Pratik Vyas
dda239fd49
bumped to version 4.9.2
2014-10-30 14:52:17 +06:00
Nabin Hait
ee212e7bb5
[fix] Floating point issue fixed in payment reconciliation
2014-10-29 14:26:05 +05:30
Neil Trini Lasrado
f92b026405
fixed
2014-10-28 14:50:47 +05:30
Neil Trini Lasrado
2c404cf34f
FIX validate-bom wrong condition
2014-10-28 14:50:47 +05:30
Nabin Hait
6c698e19ca
Merge pull request #2356 from neilLasrado/cost-center-undefined-error-fix
...
fix - validations added for auto fetch of cost center
2014-10-28 14:50:27 +05:30
Neil Trini Lasrado
6fc2821e5f
fix - validations added for auto fetch of cost center
2014-10-28 14:36:26 +05:30
Neil Trini Lasrado
df4b947e40
data type of start_date and end_date changed to datetime
2014-10-27 14:41:43 +05:30
Neil Trini Lasrado
4a75a42437
Filters added
2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
712cd7a426
Calender and gantt chart view added for production order doctype
2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
9d01133e49
start date and end date added to production order doctype
2014-10-27 13:37:41 +05:30
Nabin Hait
7cdb25b733
Merge pull request #2337 from neilLasrado/makepaymententryfix
...
Error fix, arguments in function call for Make Payment Entry from SI/PI
2014-10-27 11:42:50 +05:30
Nabin Hait
823774ee15
Merge pull request #2340 from neilLasrado/fixstockentryerror
...
Fix error in get_default_cost_center() function
2014-10-27 11:42:28 +05:30
ankitjavalkarwork
4e61536f50
Fix Customer Issue error on click event of Serial No. field
2014-10-27 11:08:05 +05:30
Neil Trini Lasrado
d718c93726
shopping cart fix
2014-10-27 11:03:09 +05:30
Pratik Vyas
daed0b655a
bumped to version 4.9.1
2014-10-27 09:56:36 +06:00
Nabin Hait
10b155a486
cost center based on project
2014-10-23 13:18:59 +05:30
ankitjavalkarwork
14e1d20df3
Change position of 'To Time' field for better UX
2014-10-22 16:55:29 +05:30
Nabin Hait
f5b94143dc
Minor fixes
2014-10-22 16:14:41 +05:30
Neil Trini Lasrado
0683fc33ed
Fix error in get_default_cost_center() function
2014-10-22 14:51:37 +05:30
Pratik Vyas
16343683d9
bumped to version 4.9.0
2014-10-22 14:49:17 +06:00
Nabin Hait
16e05c321c
Removed stock ageing grid report
2014-10-22 13:10:43 +05:30
Nabin Hait
23d7919865
Stock ageing report fix
2014-10-22 13:06:26 +05:30
Nabin Hait
38265efc39
Minor fix
2014-10-21 20:23:39 +05:30
Rushabh Mehta
3daa49ac1f
[shopping-cart] i'm back
2014-10-21 16:16:30 +05:30
Rushabh Mehta
39dbf73de7
[merge] item-variants
2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35
Merge pull request #2231 from rmehta/item-variants
...
Item variants
2014-10-21 12:38:16 +05:30
Neil Trini Lasrado
572ad4c8ef
Error fix, arguments in function call for Make Payment Entry from SI/PI
2014-10-21 12:34:07 +05:30
Rushabh Mehta
2d414706dc
[hotfix] translation boo boo
2014-10-21 11:49:40 +05:30
Rushabh Mehta
45d03af8f6
[translations] update
2014-10-20 17:11:06 +05:30
Nabin Hait
73804580d4
validate quotation to lead or customer
2014-10-20 11:18:11 +05:30
Nabin Hait
259f9779db
Credit Note: Set total amount and print format fix
2014-10-20 11:18:11 +05:30
Neil Trini Lasrado
1cdfbdb899
fiscal year auto-create added
2014-10-17 15:44:22 +05:30
Pratik Vyas
5eb373f7b5
bumped to version 4.8.0
2014-10-17 15:34:05 +06:00
Nabin Hait
fc2dd44694
Partial payment reconciliation. Fixes #1982
2014-10-17 14:57:20 +05:30
Pratik Vyas
26d096aa87
bumped to version 4.7.2
2014-10-15 16:04:39 +06:00
Nabin Hait
476c613ba6
Merge pull request #2317 from nabinhait/stock_reco
...
repost stock utility
2014-10-15 15:33:50 +05:30
Nabin Hait
2348a5f592
repost stock utility
2014-10-15 15:31:33 +05:30
Pratik Vyas
63914dd55b
bumped to version 4.7.1
2014-10-15 15:14:35 +06:00
Nabin Hait
93a8042f08
Merge pull request #2316 from nabinhait/stock_reco
...
Minor fix
2014-10-15 14:44:06 +05:30
Nabin Hait
b2f32dac1b
Minor fix
2014-10-15 14:42:18 +05:30
Pratik Vyas
5e46ce8a50
bumped to version 4.7.0
2014-10-15 15:05:47 +06:00
Nabin Hait
3b7342b7b5
Merge pull request #2315 from nabinhait/stock_reco
...
Strip company in setup wizard
2014-10-15 13:59:07 +05:30
Nabin Hait
531077e504
Strip company in setup wizard
2014-10-15 13:55:37 +05:30
Nabin Hait
147918ed66
Merge pull request #2313 from nabinhait/stock_reco
...
Fix gl entries for stock transactions
2014-10-15 12:44:59 +05:30
Nabin Hait
9bbfca9226
Fix gl entries for stock transactions
2014-10-15 12:24:38 +05:30
Nabin Hait
f1a07ff105
Allow zero rate while reposting
2014-10-15 12:23:35 +05:30
Nabin Hait
fb6e434315
Guess valuation rate in case of negative stock
2014-10-15 11:34:40 +05:30
Pratik Vyas
663bfeacf4
bumped to version 4.6.2
2014-10-14 18:04:01 +06:00
Nabin Hait
e918ebd721
Merge pull request #2307 from nabinhait/stock_reco
...
Minor fixes
2014-10-14 17:16:32 +05:30
Nabin Hait
0dc18f0102
Minor fixes
2014-10-14 17:15:02 +05:30
Pratik Vyas
49365d0982
bumped to version 4.6.1
2014-10-14 16:46:29 +06:00
Nabin Hait
bf492122f8
minor fix
2014-10-14 16:09:14 +05:30
Nabin Hait
38d0ed9f3a
Negative stock allowed for perpetual inventory. Blocked in specific case
2014-10-14 16:08:19 +05:30
Pratik Vyas
78f86e9385
bumped to version 4.6.0
2014-10-14 13:07:07 +06:00
Neil Trini Lasrado
c40451ee2e
Patch Fixed
2014-10-14 12:14:39 +05:30
Neil Trini Lasrado
6644406185
Fix - BOM calculated wrong cost on update cost
2014-10-14 12:14:38 +05:30
Nabin Hait
8a28ccfa2f
Repost gl entries where mismatch with stock balance
2014-10-14 11:41:56 +05:30
Nabin Hait
17a16eeaf4
Tets case fixed for payment tool
2014-10-13 11:43:14 +05:30
Nabin Hait
3d3f0bcf54
Minor fix in setup wizard
2014-10-13 11:32:41 +05:30
Nabin Hait
bc8b20ae3c
Allocate entire advance amount if advance against SO/PO
2014-10-13 10:48:26 +05:30
Nabin Hait
daf344e5fd
Precision fixed in batch-wise balance report
2014-10-13 10:48:26 +05:30
Nabin Hait
a538f8a24a
Merge pull request #2296 from nabinhait/stock_reco
...
Stock balance report and valuation fixes
2014-10-10 21:23:30 +05:30
Nabin Hait
70ec88b733
fixed test cases
2014-10-10 21:22:46 +05:30
Nabin Hait
4f0e5db216
Stock balance grid report deprecated and moved to server side
2014-10-10 20:54:57 +05:30
Nabin Hait
79ed124939
Update journal_voucher.py
2014-10-10 18:19:03 +05:30
Nabin Hait
30a0e3e8b4
Merge pull request #2275 from ankitjavalkarwork/fix2164
...
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
2014-10-10 18:05:19 +05:30
Nabin Hait
7c6f990cf9
Minor fix for moving average
2014-10-10 18:03:27 +05:30
Nabin Hait
7820b171d3
Stock balance grid report deprecated and moved to server side
2014-10-10 18:03:07 +05:30
ankitjavalkarwork
ad3d698fd8
[ #2164 ] Add test case for delivered qty in Sales Order
2014-10-10 16:59:47 +05:30
ankitjavalkarwork
0cf4cc283c
Add Shipping Addr to Sales Invoice
2014-10-10 16:55:03 +05:30
ankitjavalkarwork
9a4b173b88
Add validation for stopped orders, advance payment in journal voucher
2014-10-10 16:28:41 +05:30
Nabin Hait
a5082d6233
Merge pull request #2283 from neilLasrado/employee-reports-to
...
employee cannot report to himself validation added to employee doctype
2014-10-10 15:20:13 +05:30
ankitjavalkarwork
6d83454237
Disallow Stopped Orders in Against Voucher table
2014-10-10 13:30:10 +05:30
ankitjavalkarwork
ff231b5e62
Allow advance JV payments in Accounts Receivable/Payable
2014-10-10 13:13:39 +05:30
Nabin Hait
4d74216147
Maintain negative stock balance if balance qty is negative
2014-10-09 19:25:19 +05:30
ankitjavalkarwork
e69a611991
[ #2164 ] New field names in DN, fix field name refs, Patch added
2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d
[ #2164 ] Add Delivered Qty to Sales Inv from Delivery Note, fix issues
2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
9b08062bed
employee cannot report to himself validation added to employee doctype
2014-10-09 17:26:17 +05:30
Neil Trini Lasrado
eaae58f507
Transaction.js fixed , code commonified
2014-10-09 15:01:13 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6
Fixed issues
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5
Fiscal year autofetch added
2014-10-09 15:01:12 +05:30
ankitjavalkarwork
e93b1fc508
[fix][ #1450 ] Add Shipping Addr field to Sales Invoice
2014-10-09 12:11:49 +05:30
Nabin Hait
b7e5ad0a31
Merge pull request #2276 from ankitjavalkarwork/sopofield
...
Rearrange To/From, Recurring Type field for better UX
2014-10-09 11:58:13 +05:30
Nabin Hait
0ba32b05be
Merge pull request #2266 from ankitjavalkarwork/fix1387
...
Add Customer Credit Balance Report
2014-10-09 11:45:26 +05:30
Nabin Hait
12ade3c682
Merge pull request #2250 from ankitjavalkarwork/fix1808
...
[fix][#1808 ] Allow configurable AR/AP ageing dates
2014-10-09 11:24:01 +05:30
Pratik Vyas
e435592d64
[minor] Fix default website style patch (reload doc)
2014-10-09 11:22:12 +05:30
Nabin Hait
7ddde8dc3a
Merge pull request #2278 from nabinhait/stock_reco
...
stock reco and repost vouchers
2014-10-08 18:38:54 +05:30
Nabin Hait
fce2881de6
minor fix
2014-10-08 18:38:27 +05:30
Nabin Hait
e96e83d557
stock reco and repost vouchers
2014-10-08 18:06:14 +05:30
ankitjavalkarwork
1b2944e871
Rearrange To/From, Recurring Type field for better UX
2014-10-08 14:24:58 +05:30
Rushabh Mehta
074e73a0dd
[translations] updated via translator
2014-10-08 14:16:33 +05:30
Rushabh Mehta
ebc6016ffb
[tests] fixes
2014-10-08 13:54:19 +05:30
Nabin Hait
8923801881
Update stock_entry.py
2014-10-08 13:20:31 +05:30
Rushabh Mehta
7472a1147c
[tests] fixes
2014-10-08 12:41:06 +05:30
Rushabh Mehta
c2d2857540
[fixes] tests and moved reorder_item to separate module
2014-10-08 12:19:55 +05:30
Rushabh Mehta
f850987db0
[fixes] tests and moved reorder_item to separate module
2014-10-08 12:03:19 +05:30
Nabin Hait
6c48ef781b
Utility: Repost stock ledger entries and gl entries for all stock transactions
2014-10-08 11:02:18 +05:30
Nabin Hait
adeb976a1b
Block negative stock in perpetual inventory
2014-10-08 11:02:18 +05:30
Nabin Hait
bb19b91ef9
stock reco fixes
2014-10-08 11:02:18 +05:30
Nabin Hait
bfa7f171bd
Stock reconciliation sl entries
2014-10-08 11:02:18 +05:30
Nabin Hait
b96c014daf
Stock Reconciliation logic simplified
2014-10-08 11:02:18 +05:30
Rushabh Mehta
c62b6a815b
[tests] fixes to stock entry
2014-10-07 17:15:30 +05:30
pdvyas
099ad0f5e1
bumped to version 4.5.2
2014-10-07 17:35:32 +06:00
Rushabh Mehta
b31e90c7a5
[tests] fixes to stock entry
2014-10-07 16:56:46 +05:30
Rushabh Mehta
db08041f05
[fix] remove test for item attribute value
2014-10-07 15:39:35 +05:30
Rushabh Mehta
724f9e57e3
[item-variants] get table values from template if not set in variant #2224
2014-10-07 15:29:58 +05:30
ankitjavalkarwork
6c29d8789a
[fix][ #1769 ] Add disable option to Sales/Purchase Tax Master with validation
2014-10-07 14:44:37 +05:30
Nabin Hait
803cd11f68
Update patches.txt
2014-10-07 13:05:29 +05:30
Rushabh Mehta
baef96b5a2
[item-variants] allow production order of variant #2224
2014-10-07 12:34:19 +05:30
ankitjavalkarwork
fe7a6b502a
Add Customer Credit Balance Report, minor changes
2014-10-07 11:41:31 +05:30
Rushabh Mehta
1a7637459c
[item-variants] added more validations, tests #2224
2014-10-07 11:40:47 +05:30
Rushabh Mehta
ef276045c4
[item variants] make variants, bom updates
2014-10-07 11:40:47 +05:30
Rushabh Mehta
70aa8933b1
[item variant] started
2014-10-07 11:39:54 +05:30
Nabin Hait
0ef1e75c56
party model patch included in patches.txt
2014-10-07 11:37:58 +05:30
Nabin Hait
b70712dbba
Voucher dynamic link in general ledger report
2014-10-07 11:32:54 +05:30
ankitjavalkarwork
437af5b031
[fix][ #1808 ] Allow configurable AR/AP ageing dates
2014-10-07 11:32:21 +05:30
Rushabh Mehta
4c057fe693
Merge pull request #2269 from rmehta/fixes
...
[fix] packing slip
2014-10-07 11:06:08 +05:30
Rushabh Mehta
9974b16c32
[fix] packing slip
2014-10-07 10:52:05 +05:30
Nabin Hait
f065b756e5
Update customer.json
2014-10-06 17:50:58 +05:30
Nabin Hait
2dcc576f0e
Chart finalizzed for Austria and UAE
2014-10-06 13:15:21 +05:30
Nabin Hait
6f17cf93c5
Party balance
2014-10-06 13:15:21 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
678b441082
Payment tool as per party model
2014-10-06 13:15:02 +05:30
Nabin Hait
36cf4a4708
Test case fixes
2014-10-06 13:15:02 +05:30
Nabin Hait
034ac6b00b
Payment Reconciliation based on party
2014-10-06 13:14:22 +05:30
Nabin Hait
894a1b539a
Dynamic link in general ledger and stock ledger report
2014-10-06 13:14:22 +05:30
Nabin Hait
cb8e255f0f
Dynamic link for voucher no in AR/AP report
2014-10-06 13:14:22 +05:30
Nabin Hait
bd1c8aff8e
Deleted customer/supplier account head report
2014-10-06 13:14:02 +05:30
Nabin Hait
76030540cb
Accounts Receivable/Payable report based on party
2014-10-06 13:14:02 +05:30
Nabin Hait
965a5a34b5
Party is now dynamic link in JV and GL Entry
2014-10-06 13:13:28 +05:30
Nabin Hait
62c762aac5
Sales/purchase register and item-wise sales/purchase register fixes for party
...
Show Delivery Note and Purchase Receipt based on SO and PO if it not defined in SI/PI #2166
2014-10-06 13:13:27 +05:30
Nabin Hait
8f44f03cba
Party model patch
...
- Create receivable / payable account, set them in company
- Set party in JV and GL Entry
- Delete all exisintg individual party account
2014-10-06 13:13:27 +05:30
Nabin Hait
db030d1761
Set Receivable/Payable account based on party
2014-10-06 13:13:27 +05:30
Nabin Hait
e2095c0dd7
Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type
...
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
2014-10-06 13:12:05 +05:30
Nabin Hait
3225102eb9
Update outstanding amt based on party
...
Party mandatory if account is receivable/payable
Fetch advance based on party
Reconciliation splitting logic based on party
2014-10-06 13:09:18 +05:30
Nabin Hait
cc582bd774
posted party in gl entry and multiple other fixes
2014-10-06 13:06:11 +05:30
Nabin Hait
3a40435f8c
Credit days and credit limit option in customer group / supplier type #1354
2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f
Credit Limit and credit days fixes #2031
2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
Nabin Hait
fbc3d25d13
Root type defined for uae and austria
2014-10-06 13:01:58 +05:30
Nabin Hait
9ddc002d6a
country wise chart of accounts restructured
2014-10-06 13:01:58 +05:30
Nabin Hait
712aa5809d
Minor changes in import-from-odoo
2014-10-06 13:01:57 +05:30
ankitjavalkarwork
9e5f319d80
[ #2253 ] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO
2014-10-06 12:58:38 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Stefan Siegel
76a8c75592
Fix opportunities not showing in "Linked With" dialog
2014-10-03 13:25:42 +02:00
Nabin Hait
52527d2fe6
Merge pull request #2249 from ankitjavalkarwork/fix1840
...
[fix][minor] Set Project Gantt Chart dates same as Project dates
2014-10-03 12:53:58 +05:30
ankitjavalkarwork
6388c18b07
[fix][minor] Set Project Gantt Chart dates same as Project dates
2014-10-02 17:02:48 +05:30
ankitjavalkarwork
e9877a0c48
[fix][minor]Add Actual Qty, Projected Qty to Ordered Items to be Delivered Report
2014-10-01 18:07:25 +05:30
Nabin Hait
4f614b4030
Merge pull request #2195 from neilLasrado/manufacture-and-repack
...
[fix] Issue #2183 - Manufacturing and repack seprated in stock entry
2014-09-30 15:11:05 +05:30
Neil Trini Lasrado
3a19a71262
patch fixed
2014-09-30 14:48:38 +05:30
Neil Trini Lasrado
29d1a1c593
manufacturing and repack sepreted, test cases fixed, patch fixed
2014-09-30 14:07:56 +05:30
Neil Trini Lasrado
3b90de558f
Has Batch No field should be freezed #2023
2014-09-30 12:57:32 +05:30
ankitjavalkarwork
44d42ddf63
[fix] Merge permission roles to modify frozen entries/set frozen accounts
2014-09-30 10:40:39 +05:30
Aditya Duggal
a2c9d35efb
Added the dynamic link field.
2014-09-29 17:44:28 +05:30
Aditya Duggal
4c058f4056
Added the dynamic link and removed the link column
2014-09-29 17:41:19 +05:30
Pratik Vyas
4e81e4065b
bumped to version 4.5.1
2014-09-29 16:10:04 +06:00
Nabin Hait
82d7c0c9eb
Patch: Fix gl entries for stock transactions
2014-09-29 15:07:51 +05:30
Rushabh Mehta
86211cd219
Merge pull request #2203 from rmehta/mailbox
...
Mailbox
2014-09-29 14:18:10 +05:30
Rushabh Mehta
e1446eb516
[fix] quotation status
2014-09-29 14:09:50 +05:30
Rushabh Mehta
20fa996dfa
[fix] quotation status
2014-09-29 13:58:40 +05:30
Rushabh Mehta
39764685f0
[fix] material request feed
2014-09-29 13:00:36 +05:30
Rushabh Mehta
e1509162e1
[fix] material request feed
2014-09-29 12:53:53 +05:30
Rushabh Mehta
3ef0b7ce99
[fix] support ticket feed
2014-09-29 12:48:31 +05:30
Rushabh Mehta
66e08e39f7
[fix] currency moved to frappe
2014-09-29 12:17:03 +05:30
Rushabh Mehta
1c91868755
[version] 5.0.0-alpha
2014-09-29 12:09:55 +05:30
Nabin Hait
d60235e239
minor fix in warehouse-wise stock balance report
2014-09-29 11:36:06 +05:30
Nabin Hait
9b50b0a762
Fixes for item list view
2014-09-29 11:36:06 +05:30
Pratik Vyas
16edacebc7
bumped to version 4.5.0
2014-09-26 17:19:59 +06:00
Nabin Hait
5e080f9039
Update utils.py
2014-09-26 15:05:30 +05:30
Nabin Hait
b0bd99266d
Fix in landed cost voucher
2014-09-26 14:30:02 +05:30
Nabin Hait
b9e04815f8
Repost gl entries for future stock vouchers
2014-09-26 14:24:42 +05:30
Nabin Hait
18ccc27b1b
Minor fix in naming naming series
2014-09-26 14:23:00 +05:30
Nabin Hait
95f1fe92e2
Maintenance visit search field issue fixed
2014-09-26 14:23:00 +05:30
Nabin Hait
b783f519ee
Fixes in sales/purchase invoice trends report
2014-09-26 14:23:00 +05:30
Nabin Hait
996a1010cb
Moved Installation note from tools to documents section
2014-09-26 14:23:00 +05:30
Anand Doshi
32a9dfd983
Merge branch 'sbkolate-develop' into develop
2014-09-22 13:19:24 +05:30
Anand Doshi
1394509343
Fixes for recurring document
2014-09-21 19:45:49 +05:30
Pratik Vyas
14ac8f71b7
bumped to version 4.4.2
2014-09-19 15:16:07 +06:00
Nabin Hait
7c831c3fe5
Get advance in sales/purchase invoice
2014-09-19 14:31:49 +05:30
Nabin Hait
778ff463af
Minor fix in authorization control
2014-09-19 11:39:47 +05:30
Nabin Hait
70a31d5402
Gantt view fix for translations
2014-09-19 11:18:10 +05:30
ankitjavalkarwork
9aa11d2ad7
Add ability to fetch Non stock items in Gross Profit report
2014-09-18 19:08:04 +05:30
Nabin Hait
48f5fa69f3
Fetch and validate advance entries in sales/purchase invoice
2014-09-18 15:04:11 +05:30
Pratik Vyas
e539297e53
bumped to version 4.4.1
2014-09-18 14:49:14 +06:00
Nabin Hait
bbc3d015a3
Update authorization_control.py
2014-09-18 14:09:20 +05:30
Anand Doshi
8370cb3e71
Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop
2014-09-18 12:06:05 +05:30
Nabin Hait
4073880ecf
Escaped single quote in authorization control queries
2014-09-18 11:01:26 +05:30
Rushabh Mehta
c786802124
[communication] covert-wip
2014-09-17 17:28:03 +05:30
Nabin Hait
556fbc487d
Minor fix in gross profit report
2014-09-17 12:13:44 +05:30
Pratik Vyas
31c61e7eae
bumped to version 4.4.0
2014-09-16 16:28:28 +06:00
Anand Doshi
a23151b138
Merge pull request #2202 from 81552433qqcom/develop
...
hotfix for project wise report and translation.
2014-09-16 15:23:34 +05:30
Anand Doshi
11b75759d2
Merge pull request #2194 from ankitjavalkarwork/stockbalreport
...
Update report with Valuation rate, stock values, move to Main report
2014-09-16 15:22:25 +05:30
Anand Doshi
8950abc36f
Merge pull request #2197 from anandpdoshi/anand-september-15
...
[minor] removed Suggest
2014-09-16 15:18:57 +05:30
Rushabh Mehta
bf8715dba4
[refactor] used frappe.sendmail
2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
7fb79f6062
#2092
2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0
[cleanup] removed communication js, fields
2014-09-16 15:11:42 +05:30
Rushabh Mehta
7b128dc15b
[refactor] remove Home module
2014-09-16 15:10:54 +05:30
Rushabh Mehta
9786faa862
[refactor] hooks.py fixes
2014-09-16 15:10:54 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
81552433qqcom
1db294e837
hotfix for project wise report
...
translation patch for email digest and support ticket.
2014-09-16 16:49:58 +08:00
Nabin Hait
16e943f120
Removed link of item-wise last purchase rate from buying home page
2014-09-16 12:57:31 +05:30
Nabin Hait
9d610214cf
Strip party name before checking for account
2014-09-16 12:28:40 +05:30
Nabin Hait
c25681c36c
Added item group and brand in sales-person-wise transaction summary report
2014-09-16 12:28:40 +05:30
Nabin Hait
5cd20e3d24
Minor fix
2014-09-16 11:26:53 +05:30
Nabin Hait
ca260618d8
Minor fix
2014-09-16 11:24:25 +05:30
Anand Doshi
30c5b41398
[minor] removed Suggest
2014-09-15 16:43:34 +05:30
Sambhaji Kolate
f37d4337a4
fix test for purchase order
2014-09-15 13:37:46 +05:30
Anand Doshi
93c2adb2cd
Merge pull request #2193 from anandpdoshi/anand-september-15
...
Recurring fix, cherry-picked nabin's address template fix
2014-09-15 13:04:12 +05:30
Sambhaji Kolate
525ab0a925
fix build
2014-09-15 12:57:58 +05:30
Anand Doshi
a92c6886cd
Merge pull request #2173 from ankitjavalkarwork/fix2043
...
Add message on cancel in SI if C-Form exists, fix minor error, Add validation in C-Form
2014-09-15 12:56:51 +05:30
Anand Doshi
01d171756b
[fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation
2014-09-15 12:50:37 +05:30
Sambhaji Kolate
930e7f5578
fix conflict
2014-09-15 12:43:48 +05:30
Sambhaji Kolate
d14e15d432
fix conflict
2014-09-15 12:31:44 +05:30
Sambhaji Kolate
4d3a18890b
fix conflict
2014-09-15 12:20:11 +05:30
Nabin Hait
65bef02607
Fixes in address template
2014-09-15 12:18:28 +05:30
81552433qqcom
ac0c3fb696
#2190 hotfix, item page
2014-09-15 10:21:36 +08:00
81552433qqcom
6d02939256
changed indent. as well use tab instead of space.
2014-09-12 16:22:28 +05:30
81552433qqcom
e3b63f2d9c
added __() for options that need label.
2014-09-12 16:07:12 +05:30
81552433qqcom
1c440b3b31
month options doesn't get translated.
2014-09-12 16:07:12 +05:30
81552433qqcom
c5a0ef8399
fix according to the suggestion.
2014-09-12 16:07:12 +05:30
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42
translations.
2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54
various translation missed __()
2014-09-12 16:07:11 +05:30
Anand Doshi
61a591944b
[minor] ui/ux fixes in Payment Tool
2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817
Payment Tool #2106
2014-09-12 15:23:46 +05:30
Anand Doshi
84e08fd534
Merge pull request #2174 from neilLasrado/cost-of-production-cycle-magix
...
Cost of Production cycle
2014-09-12 14:45:19 +05:30
Neil Trini Lasrado
e7c48ed3b0
bom operation inList view fix
2014-09-12 12:08:02 +05:30
Nabin Hait
c432270ca8
Report print format fixed for translated columns
2014-09-12 12:00:47 +05:30
Neil Trini Lasrado
6a7f75c3e3
Cost of Production cycle
2014-09-12 11:25:03 +05:30
Neil Trini Lasrado
e9882e12ba
Cost of Production cycle
2014-09-12 11:25:03 +05:30
ankitjavalkarwork
3df10429db
Add message on cancel in SI if C-Form exists, Add validation in C-Form, remove update_c_form
2014-09-11 16:58:18 +05:30
Anand Doshi
eee569bb20
Merge pull request #2177 from anandpdoshi/anand-september-11
...
[fix] transfer_qty in get_stock_and_rate
2014-09-11 16:47:59 +05:30
ankitjavalkarwork
2e07305616
Update report with Valuation rate, stock values, move to Main report
2014-09-11 16:47:19 +05:30
Anand Doshi
2f9c36a588
Merge pull request #2175 from ankitjavalkarwork/fix2153
...
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-11 16:47:08 +05:30
Anand Doshi
907494c5d4
[fix] transfer_qty in get_stock_and_rate
2014-09-11 16:22:12 +05:30
Sambhaji Kolate
b14401c320
change convert_to_recurring() to take recurring_id dynamicaly
2014-09-11 16:09:05 +05:30
Nabin Hait
cece0c7ffe
Opening entry should not be considered in bank reconciliation statement
2014-09-11 13:59:00 +05:30
ankitjavalkarwork
5e34383e25
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-10 17:54:42 +05:30
Sambhaji Kolate
b2a3f2d386
some minor changes get fixed for PO/PI
2014-09-10 17:40:48 +05:30
Sambhaji Kolate
6b679c45df
Updated purchase_invoice.json and purchase_order.json with some missed out changes
2014-09-10 13:57:45 +05:30
Sambhaji Kolate
e3d2643f2b
Changes for Recurring PO/PI
2014-09-10 13:07:59 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Pratik Vyas
6675ce9036
bumped to version 4.3.0
2014-09-09 15:40:47 +06:00
Pratik Vyas
2cf75fcca2
change version in hooks.py
2014-09-09 15:10:18 +05:30
Anand Doshi
48b3d1383f
[minor] Cheque Printing Format
2014-09-09 12:59:16 +05:30
Anand Doshi
dc79334f1c
[fix] Clear website cache for Item Group on saving Item
2014-09-09 12:35:15 +05:30
Anand Doshi
ab74a502e2
Merge pull request #2162 from nabinhait/hotfix
...
Get items in PO from material requests based on supplier
2014-09-09 12:07:27 +05:30
Nabin Hait
fa18e7c21f
Merge pull request #2140 from nathando/patch-1
...
get_item_list does not [item qty=0]
2014-09-09 12:06:21 +05:30
Nabin Hait
ff7e9b6b22
Get items in PO from material requests based on supplier
2014-09-09 11:01:55 +05:30
Anand Doshi
45c9b1c065
[minor] Set in_list_view for Sales and Purchase item tables
2014-09-08 17:42:17 +05:30
Anand Doshi
dcfcd693c2
Merge pull request #2158 from rmehta/translated
...
transations-08-sep-2014
2014-09-08 15:30:15 +05:30
RM
7ab4ee1d79
transations-08-sep-2014
2014-09-08 09:28:34 +00:00
Nabin Hait
c017ed251d
Merge pull request #2151 from ankitjavalkarwork/fix1999
...
Allow renaming for Sales Partner Doctype
2014-09-08 14:23:17 +05:30
Anand Doshi
65a5f85af5
Setup Wizard: set corrected number format in system settings
2014-09-05 17:27:25 +05:30
Anand Doshi
52a39a00d5
Merge pull request #2149 from anandpdoshi/anand-september-5
...
[fix] Validate Expense Approver
2014-09-05 15:24:24 +05:30
ankitjavalkarwork
ce9a9eeecc
Allow renaming for Sales Partner Doctype
2014-09-05 14:58:21 +05:30
Nabin Hait
91fb661d12
minor fixes
2014-09-05 14:56:24 +05:30
Anand Doshi
0b74b6d98c
[fix] Validate Expense Approver
2014-09-05 14:41:53 +05:30
Anand Doshi
d42326bf43
[hotfix] hooks - recurring order
2014-09-05 11:20:29 +05:30
Nabin Hait
84f0cc6614
Dont show opening entries in Bank reconciliation
2014-09-04 15:21:46 +05:30
Nabin Hait
0f798dda15
Valuation rate for finished goods in repack entries
2014-09-04 15:21:46 +05:30
Nabin Hait
629e51a8e9
Search field fixed in stock entry
2014-09-04 15:21:46 +05:30
Anand Doshi
4211aa41a0
[hotfix] Product Search 'More' button
2014-09-04 15:16:13 +05:30
Anand Doshi
d91c4d3e00
[translations] German translations from a user
2014-09-03 21:39:05 +05:30
Anand Doshi
3d911eba6c
[minor] id.csv
2014-09-03 17:33:33 +05:30
nathando
247e9ffc96
get_item_list does not [item qty=0]
...
- By using `if not d.qty:` it totally limits the chance of creating an empty Delivery Note
- Should be changed to `if d.qty is None`
Use case for empty DN:
- Open a Delivery Note and tight to a specific Sales Order first without knowing the real qty at this point.
- Using barcode scanner to receive Sales Order to this DN (multiple times).
2014-09-03 15:03:31 +08:00
Nabin Hait
a84f3663dd
removed test records for landed cost voucher
2014-09-02 23:11:06 +05:30
Nabin Hait
96bdc5834c
Get valuation rate in manufacturing/repack entry
2014-09-02 20:02:25 +05:30
Nabin Hait
3f4885e342
repost stock reconciliation
2014-09-02 20:02:24 +05:30
Nabin Hait
ee2bc92ab2
Merge pull request #2134 from nabinhait/hotfix
...
Stock reconciliation fixes
2014-09-02 20:01:57 +05:30
Pratik Vyas
144f06e381
Update patches.txt
2014-09-01 18:31:11 +05:30
Nabin Hait
7f3f2a0f0a
Fixes in repost_stock utility
2014-09-01 18:16:24 +05:30
Nabin Hait
9e563e7b47
Stock reconciliation when valuation rate column is blank
2014-09-01 18:16:24 +05:30
Nabin Hait
12ce3eefca
landed cost voucher added in module page
2014-09-01 18:16:24 +05:30
Anand Doshi
f395b7ce11
[hotfix] item grid rate visibility booboo
2014-09-01 17:26:00 +05:30
Anand Doshi
4228adfaa7
Merge pull request #2109 from ankitjavalkarwork/recurringorder2
...
Commonified Recurring for Sales Invoice and Sales Order
2014-09-01 16:34:12 +05:30
Anand Doshi
8ad474b910
Merge pull request #2122 from neilLasrado/print-templates-fix
...
[Cosmetics] Print Templates Layout Improved
2014-09-01 16:33:34 +05:30
ankitjavalkarwork
737d8e4d9f
fix minor issue and set default value send as pdf
2014-09-01 16:22:56 +05:30
ankitjavalkarwork
aaac7c17b8
Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document
2014-09-01 16:22:56 +05:30
ankitjavalkarwork
28a975dd32
Add patch for field name change in SI, rename email template
2014-09-01 16:22:56 +05:30
ankitjavalkarwork
e60822b094
Add tests for Recurring Document, Sales Inv, Sales Order, fix minor errors
2014-09-01 16:20:59 +05:30
ankitjavalkarwork
ac085e0f59
Add manage_recurring_documents and path to hooks, fix minor issues
2014-09-01 16:20:59 +05:30
ankitjavalkarwork
e8331d40f3
Commonify Recurring Sales Order/Invoice
2014-09-01 16:20:59 +05:30
Anand Doshi
24989b90ba
Hide Rate, Amount in Item Grid template based on permlevel
2014-09-01 12:38:09 +05:30
Anand Doshi
98eacdb785
[patch] Set company's country
2014-09-01 10:23:47 +05:30
Neil Trini Lasrado
8331ec7482
[cosmetics] Cheque Print format 2
2014-08-29 20:27:45 +05:30
Neil Trini Lasrado
d43752fc4f
[cosmetics] Cheque Print format 1
2014-08-29 16:43:48 +05:30
Neil Trini Lasrado
bd03c8b28a
Merge branch 'develop' of https://github.com/frappe/erpnext into print-templates-fix
2014-08-29 16:42:44 +05:30
Neil Trini Lasrado
f65817d4c2
[cosmetics] payment receipt Print format 1
2014-08-29 16:31:57 +05:30
Anand Doshi
40a8ae2907
[fix] get incoming rate
2014-08-29 16:28:31 +05:30
Anand Doshi
12b98027ee
[fix] Maintenance Scheduler periodicity validation
2014-08-29 16:11:11 +05:30
Neil Trini Lasrado
45a0ea9628
Merge branch 'develop' of https://github.com/frappe/erpnext into print-templates-fix
2014-08-29 15:48:42 +05:30
Anand Doshi
98ff85dea1
Merge pull request #2108 from neilLasrado/fix-issue-448
...
[Fix] Issue #448
2014-08-29 15:46:13 +05:30
Anand Doshi
0015157cba
Merge pull request #2120 from nabinhait/hotfix
...
Fixes in BOM and maintenance schedule
2014-08-29 15:43:00 +05:30
Neil Trini Lasrado
4e16e9ed89
Refactored Credit Note Print Format
2014-08-29 13:20:58 +05:30
Anand Doshi
9f0ea97d85
[fix] get future vouchers query
...
[print-template] Credit Note Issue #31 2
2014-08-29 12:50:28 +05:30
Neil Trini Lasrado
7a435bb4f1
[print-template] Credit Note Issue #31 1
2014-08-29 12:50:28 +05:30
Neil Trini Lasrado
014346acba
[print-template] Credit Note
2014-08-29 12:50:28 +05:30
Anand Doshi
c90773cc85
Merge pull request #2115 from anandpdoshi/user-permission-doctypes
...
HR permissions, translations
2014-08-29 11:55:51 +05:30
Nabin Hait
0514e07ef4
minor fix
2014-08-29 11:50:59 +05:30
Nabin Hait
14b8af2e65
Rounding issue fixed for bom quantity
2014-08-29 11:50:58 +05:30
Nabin Hait
818bacae49
Minor fix in maintenance schedule
2014-08-29 11:50:58 +05:30
Anand Doshi
bb370f3b6a
HR - Leave Approver and Expense Approver fields changed to Link Fields, better default permissions
2014-08-29 11:19:10 +05:30
Anand Doshi
f680626f53
[minor] send translations in response
2014-08-29 11:19:10 +05:30
Neil Trini Lasrado
83ca3e5563
[Cosmetics] Print Templates Layout Improved
2014-08-28 14:48:16 +05:30
Anand Doshi
37cb544839
[fix] default quotation list filter
2014-08-28 11:27:18 +05:30
Anand Doshi
913c51b1f8
[fix] get future vouchers query
2014-08-27 22:09:15 +05:30
Neil Trini Lasrado
cd1efb94ed
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-issue-448
2014-08-27 18:49:03 +05:30
Neil Trini Lasrado
d6d71e8078
[fix] issue 448 final 1
2014-08-27 18:48:57 +05:30
Anand Doshi
46256cddd7
Enqueue Newsletter sending in Longjob Queue
2014-08-27 12:23:52 +05:30
Neil Trini Lasrado
ad24069cdc
[fix] issue 448 final
2014-08-26 16:30:39 +05:30
Nabin Hait
3b1733bc04
minor fix in sales invoice test records
2014-08-26 16:30:39 +05:30
Anand Doshi
43f087c99d
[hotfix] Supplier read permission for Purchase User
...
[Fix] Issue #448
[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Nabin Hait
e3f2323e14
minor fix in sales invoice test records
2014-08-26 16:20:38 +05:30
Anand Doshi
c147667486
[hotfix] Supplier read permission for Purchase User
2014-08-26 14:26:07 +05:30
Anand Doshi
5ed2c06eb5
Merge pull request #2089 from neilLasrado/item_group
...
Item group
2014-08-26 12:56:54 +05:30
Neil Trini Lasrado
9d1e8b61fe
[Fix] Issue #980 final
2014-08-25 19:04:30 +05:30
Anand Doshi
e0ffe7a575
[hotfix] Product Search
2014-08-25 18:38:08 +05:30
Neil Trini Lasrado
d676491b6e
Merge https://github.com/frappe/erpnext into item_group
2014-08-25 16:18:31 +05:30
Anand Doshi
580f447bbd
Merge pull request #2100 from rmehta/aug-22
...
[cleanup] remove allow_attach
2014-08-25 16:07:50 +05:30
Rushabh Mehta
52f04da5f5
[style] default website
2014-08-25 15:17:20 +05:30
Nabin Hait
06927a20b2
Update repost_stock.py
2014-08-25 14:08:54 +05:30
Neil Trini Lasrado
caba531e89
[fix] issue#980
2014-08-25 13:22:15 +05:30
Rushabh Mehta
7a6ab91080
remove set_title_left
2014-08-25 13:04:22 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Anand Doshi
bb6b58c271
Merge pull request #2074 from neilLasrado/purchase-invoice-fix
...
[fix] frappe/erpnext#1510
2014-08-25 12:51:16 +05:30
Anand Doshi
def374370f
Merge pull request #2083 from geo-poland/basic-polish-language-support
...
Basic Polish language support
2014-08-25 12:48:33 +05:30
Nabin Hait
a592a914b8
PP Tool: get query for sales order
2014-08-22 16:25:04 +05:30
Nabin Hait
1ae48f4988
Required raw materials qty in PP tool
2014-08-22 16:20:07 +05:30
Nabin Hait
40e3d0c780
General ledger: debit/credit value rounding upto 3 decimals
2014-08-22 14:37:55 +05:30
Nabin Hait
00fc600e8b
PP Tool: Raise material request based on projected qty in selected warehouse
2014-08-22 14:06:22 +05:30
Nabin Hait
f4ad37d208
Reset receiver list always on create receiver list button
2014-08-22 12:42:57 +05:30
Nabin Hait
79f91109cd
Update pricing_rule.py
2014-08-21 19:21:25 +05:30
Nabin Hait
16aba71da0
Escaped item group value in pricing rule condition
2014-08-21 19:02:02 +05:30
Nabin Hait
8058832a48
Fixex in payment reconciliation
2014-08-21 18:06:35 +05:30
Nabin Hait
cabf9c5bee
Minor fix in status updater
2014-08-21 16:44:32 +05:30
Nabin Hait
4417529952
Packing list visibility issue
2014-08-21 16:44:32 +05:30
Nabin Hait
f71011aff0
Project query fixed
2014-08-21 11:34:31 +05:30
Nabin Hait
df5ab4e228
Minor fix in maintenance schedule
2014-08-21 11:32:39 +05:30
Neil Trini Lasrado
b02b59b8c8
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-invoice-fix
2014-08-20 14:57:24 +05:30
Neil Trini Lasrado
bf4ceb981f
Merge https://github.com/frappe/erpnext into purchase-invoice-fix
2014-08-20 14:39:22 +05:30
Neil Trini Lasrado
84e5a4a2c2
[fix-remarks-changed-issue#110]
2014-08-20 13:44:56 +05:30
Rushabh Mehta
ebd30beee4
[route] redesigned
2014-08-20 11:44:30 +05:30
Rushabh Mehta
cb067aa579
[route] refactor, wip
2014-08-20 11:44:30 +05:30
Rushabh Mehta
74bc2baa1d
remove website route, wip
2014-08-20 11:43:58 +05:30
Tytus
f546ab3130
Add csv file with initial translations.
2014-08-19 15:53:08 +02:00
Tytus
35142cb206
Add Polish language to setup wizard.
2014-08-19 15:51:36 +02:00
Nabin Hait
13313b5cb6
Merge pull request #2082 from nabinhait/hotfix
...
Bank reconciliation statement: show amounts which has cleared in the ban...
2014-08-19 17:42:26 +05:30
Nabin Hait
432431f2e6
fix for translation
2014-08-19 16:49:44 +05:30
Nabin Hait
237f3765e5
Bank reconciliation statement: show amounts which has cleared in the bank but not registered in the system
2014-08-19 16:29:31 +05:30
Anand Doshi
cca6460e65
[fix] Error Reports
2014-08-19 16:06:09 +05:30
Rushabh Mehta
354acf6fc9
Merge pull request #2076 from anandpdoshi/anand-august-19
...
[fix] Error Reports
2014-08-19 14:07:03 +05:30
Nabin Hait
0a35effe49
Precision issue in tax calculation
2014-08-19 13:22:19 +05:30
Neil Trini Lasrado
95b395505f
[new fix issue No #1510 ]
2014-08-19 13:12:33 +05:30
Neil Trini Lasrado
67e14a48b8
[fix issue No #1510 ]
2014-08-19 12:35:14 +05:30
Neil Trini Lasrado
2026148dbe
[fix issue No #1510 ]
2014-08-19 12:22:45 +05:30
Anand Doshi
78b6366325
[fix] Error Reports
2014-08-19 12:20:48 +05:30
Neil Trini Lasrado
9c3535307f
[fix] frappe/erpnext#1510
2014-08-19 10:41:34 +05:30
Anand Doshi
f72de95a38
[fix] SMS Center
2014-08-18 19:51:47 +05:30
Anand Doshi
6ab831b387
Allow Default Warehouse for Item, even if not a Stock Item
2014-08-18 19:04:19 +05:30
Anand Doshi
e4c434ab6f
[fix] Leave Application Calendar
2014-08-18 17:04:04 +05:30
Nabin Hait
c41a9480b8
Credit limit fixes
2014-08-18 15:40:36 +05:30
Nabin Hait
6394f5b1a9
minot fix in pro order
2014-08-18 15:40:36 +05:30
Nabin Hait
448c9b71c1
minot fix in material request
2014-08-18 15:40:36 +05:30
Nabin Hait
32a3a86a00
General ledger report: invalid account
2014-08-18 15:40:36 +05:30
Nabin Hait
dcce0c86ed
Minimum ordered qty validation
2014-08-18 15:40:36 +05:30
Anand Doshi
62aa8fa4e7
[minor] Removed 'PIN: ' from default Address Template
2014-08-18 12:53:37 +05:30
Dhaifallah Alwadani
5e27a759b7
Improve Arabic translation
2014-08-16 18:11:48 +01:00
Pratik Vyas
c0d31ce648
Merge pull request #2062 from nabinhait/hotfix
...
Hotfix
2014-08-15 11:06:44 +05:30
Anand Doshi
eb39435481
[hotfix] Allow on submit for Projected Qty
2014-08-14 18:08:19 +05:30
Nabin Hait
54498452b6
Stock entry minor fix
2014-08-14 15:49:44 +05:30
Nabin Hait
821aad5281
Sales/purchase return: fixes for qty validation
2014-08-14 15:15:14 +05:30
Nabin Hait
5145b1445b
Fixes in production planning tool
2014-08-14 15:15:14 +05:30
Nabin Hait
e368091627
Fixes in Payment Reconciliation
2014-08-14 15:15:14 +05:30
Rushabh Mehta
c31a1eec5b
[ux] fixes to timeline
2014-08-14 11:47:31 +05:30
Rushabh Mehta
0d0f5f6c25
[ux] fixes to timeline
2014-08-14 11:43:46 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Anand Doshi
f0075b9ce2
[fix] Opportunity communication listing
2014-08-12 15:20:39 +05:30
Anand Doshi
67d249eea9
[logic] Email Digest - use transaction/posting date
2014-08-12 12:45:23 +05:30
Anand Doshi
f957cbd8ef
[test] Purchase Receipt - update rejected serial no
2014-08-11 18:03:43 +05:30
Nabin Hait
5c0db8d05e
Landed Cost voucher test case for serialized items
2014-08-11 16:28:29 +05:30
Nabin Hait
200e8d971f
Landed Cost voucher test case for serialized items
2014-08-11 16:12:32 +05:30
Nabin Hait
a97e700371
Add rejected serial nos in Purchase Receipt if auto-created based on series
2014-08-11 16:12:32 +05:30
Nabin Hait
4e6c52dd24
Test case fixes
2014-08-11 16:12:32 +05:30
Nabin Hait
2b776e8c3a
Landed cost voucher minor fixes
2014-08-11 16:12:32 +05:30
Nabin Hait
f3e1181ad9
Landed cost voucher fixes
2014-08-11 16:12:32 +05:30
nabinhait
9cbcf96aeb
no copy property for landed cost voucher amount field
2014-08-11 16:12:32 +05:30
nabinhait
8ca3189f07
pr and pi gl entries
2014-08-11 16:12:31 +05:30
nabinhait
98e7dcfe2c
landed cost voucher minor fix
2014-08-11 16:12:31 +05:30
nabinhait
cfd1b10980
Purchase receipt gl entries if there is warehouse without account
2014-08-11 16:12:31 +05:30
nabinhait
f807cda375
PR and PI gl entries fixes for landed cost
2014-08-11 16:12:31 +05:30
nabinhait
11594c7927
purchase receipt gl entries
2014-08-11 16:12:31 +05:30
nabinhait
509aa52efc
minor fix
2014-08-11 16:12:31 +05:30
nabinhait
e2c3f7ab14
Added help in landed cost voucher
2014-08-11 16:12:31 +05:30
nabinhait
fe39442c48
Removed old landed cost wizard
2014-08-11 16:12:31 +05:30
nabinhait
b21b6598f1
Test case for landed cost voucher
2014-08-11 16:12:31 +05:30
nabinhait
5e1b0014c2
GL entries for sub-contracting and rejected qty
2014-08-11 16:12:31 +05:30
nabinhait
cc0692d714
landed cost fix
2014-08-11 16:12:31 +05:30
nabinhait
87f2401c1e
Landed Cost on_submit and gl entries for PR
2014-08-11 16:12:31 +05:30
nabinhait
f6ea21c8ae
landed cost voucher design changed #1921
2014-08-11 16:12:30 +05:30
nabinhait
4436157da1
Landed cost redesign initial commit #1921
2014-08-11 16:12:30 +05:30
Anand Doshi
b00a2422e4
[hotfix] Allow on Submit - Actual / Projected Qty for Packed Item
2014-08-11 15:54:20 +05:30
Anand Doshi
475b118fba
Merge pull request #2050 from anandpdoshi/anand-august-11
...
Feed, Form Grid
2014-08-11 13:44:01 +05:30
Anand Doshi
42335fb2cb
[minor] Allow on Submit - Actual / Projected Qty
2014-08-11 13:28:29 +05:30
Anand Doshi
96964a4e03
[minor] Visible Columns' Label should show ellipsis on overflow
2014-08-11 12:28:32 +05:30
Anand Doshi
e4aaa3d18f
[minor] Truncate comment in Feed to 240 chars
2014-08-11 12:27:47 +05:30
Nabin Hait
a6b597a0bd
Fixes in Order trends report
2014-08-11 11:54:37 +05:30
Anand Doshi
52d1ea83a0
[hotfix] Stock Entry List
2014-08-11 09:16:59 +05:30
Anand Doshi
5d64f5abd4
[hotfix] Sales Order list
2014-08-09 14:54:52 +05:30
Rushabh Mehta
23607f91cd
[fix] [pos] pos view only for draft docs
2014-08-08 17:29:16 +05:30
Anand Doshi
3a97739f83
Merge pull request #2042 from rmehta/pos-module
...
added icon for pos
2014-08-08 16:56:45 +05:30
Rushabh Mehta
e0ee6fe8cd
Merge pull request #2044 from nabinhait/hotfix
...
PO-PI mapping: divisional loss issue fixed
2014-08-08 16:44:15 +05:30
Rushabh Mehta
a3f76fc14d
Update sales_invoice.js
2014-08-08 16:43:21 +05:30
Nabin Hait
c85abbfeca
PO-PI mapping: divisional loss issue fixed
2014-08-08 16:07:02 +05:30
Rushabh Mehta
139ec2a64f
Update note_list.html
2014-08-08 15:47:56 +05:30
Rushabh Mehta
72e1719220
added icon for pos
2014-08-08 15:43:26 +05:30
Pratik Vyas
3de7757ba4
Update update_project_milestones.py
2014-08-08 14:49:53 +05:30
Anand Doshi
6b8145a813
[patch] Add currency Turkish Lira
2014-08-08 14:05:01 +05:30
Nabin Hait
688a7a7329
Merge pull request #2039 from anandpdoshi/anand-august-8
...
[fix] Show Employee Name in Employee Birthday report
2014-08-08 13:21:36 +05:30
Anand Doshi
26201a5828
[fix] Show Employee Name in Employee Birthday report
2014-08-08 12:49:11 +05:30
Anand Doshi
6cd59537b6
Merge pull request #2037 from nabinhait/hotfix
...
Fixes in 'Received Items to be Billed' report
2014-08-08 12:45:56 +05:30
Anand Doshi
4cc94df752
[tests] Fixed Test Records
2014-08-08 11:56:32 +05:30
Anand Doshi
03eadb74ab
Fixes to microtemplate feature
2014-08-08 11:56:32 +05:30
Rushabh Mehta
7a4e739d6c
templating for hr
2014-08-08 11:56:32 +05:30
Rushabh Mehta
a660464cec
added for support
2014-08-08 11:56:32 +05:30
Rushabh Mehta
c9bd3f5d4a
added templates for projects
2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5
more updates to lists and started sane filters
2014-08-08 11:56:32 +05:30
Rushabh Mehta
8544447b19
added more listview templates
2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015
added listviews for sales, purchase
2014-08-08 11:56:31 +05:30
Rushabh Mehta
67af99794d
start custom list rendering for Sales Order
2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a
built item grids for sales, purchase, stock
2014-08-08 11:56:31 +05:30
Anand Doshi
69ccf9695c
[minor] primary action
2014-08-08 11:51:24 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
Nabin Hait
f4de6e21fa
Fixes in 'Received Items to be Billed' report
2014-08-08 11:23:59 +05:30
Nabin Hait
a6db05e18d
Fixes in 'Received Items to be Billed' report
2014-08-08 11:02:06 +05:30
Nabin Hait
d91cefb23d
Update fix_account_master_type.py
2014-08-07 19:22:02 +05:30
Nabin Hait
67cd3fb89c
Fixes in making credit note from Sales Return
2014-08-07 15:34:53 +05:30
Nabin Hait
849b7b172a
minor fix
2014-08-07 15:13:52 +05:30
Nabin Hait
9a0c46fda7
Get Stock Rreceived But Not Billed Difference Amount
2014-08-07 15:10:05 +05:30
Nabin Hait
05b56d0d08
Fix account's master type
2014-08-07 15:03:41 +05:30
Nabin Hait
7881df2138
minor fix
2014-08-06 17:29:07 +05:30
Nabin Hait
fd90571d49
fiscal year validation in financial statement
2014-08-06 17:25:23 +05:30
Nabin Hait
9f7e00bb3a
Send salary slip mail after submit via Salary Manager
2014-08-06 17:25:23 +05:30
Nabin Hait
45b7d17ee8
Employee can be reselected but not changed in salary structure
2014-08-06 17:25:23 +05:30
Anand Doshi
959bd6e9e7
[test] Block Delivery Note if it is linked to a cancelled Sales Order
2014-08-05 14:25:40 +05:30
Anand Doshi
f16fefafe3
[print] [fix] empty item grid issue
2014-08-05 13:57:29 +05:30
Anand Doshi
8d16e9fd6d
[print] convert newlines to <br> based on fieldtype for Text/Small Text
2014-08-05 11:39:51 +05:30
Anand Doshi
2b8344e75c
[print] [fix] when item grid is empty
2014-08-05 11:30:37 +05:30
Rushabh Mehta
a8755af0fa
Merge pull request #2022 from nabinhait/hotfix
...
Fixes for customer / supplier renaming
2014-08-05 10:42:44 +05:30
Rushabh Mehta
ca70eaa388
Merge pull request #2019 from anandpdoshi/anand-august-1
...
Account Issues
2014-08-05 10:36:08 +05:30
Pratik Vyas
1271bc4457
[hotfix] [patch] remove missing patch
2014-08-05 06:54:11 +05:30
Nabin Hait
4d18b3f96d
Fixes for standard print formats
2014-08-04 17:01:01 +05:30
Nabin Hait
1279f1d430
Fixes for customer / supplier renaming
2014-08-04 13:05:59 +05:30
Anand Doshi
e88b7fbcc4
Journal Voucher Detail: show Account Balance as Dr or Cr. Fixes #675
2014-08-01 16:56:32 +05:30
Anand Doshi
8c838061f9
[minor] Check account read permission for get_balance_on
2014-08-01 16:13:44 +05:30
Anand Doshi
6c608e04bc
Fixes #699 - Cost Center mandatory
2014-08-01 16:04:35 +05:30
Anand Doshi
a66ef778ec
[translations] Added Turkish, Vietnamese. Updated rest of the translations. [ frappe/erpnext#2012 ]
2014-08-01 00:06:42 +05:30
Anand Doshi
1b90207360
[minor] [fix] Serial No Servic Contract Expiry
2014-07-31 18:57:51 +05:30
Anand Doshi
3f28ac3205
Merge pull request #2010 from anandpdoshi/anand-july-31
...
[print] Labels and Total Taxes and Charges
2014-07-31 16:31:57 +05:30
Anand Doshi
29817d6d8b
[print] Moved Total Taxes and Charges to the right column
2014-07-31 16:05:19 +05:30
Anand Doshi
92980e6882
Merge pull request #2009 from anandpdoshi/anand-july-31
...
Labels: Use Date instead of Posting Date
2014-07-31 15:07:11 +05:30
Pratik Vyas
b91079676d
[patch] remove reloading of removed print formats
2014-07-31 14:31:58 +05:30
Anand Doshi
fbe37c9158
Labels: Use Date instead of Posting Date
2014-07-31 14:31:25 +05:30
nabinhait
8efd74b9b1
Activity: fix for timeline-wise display
2014-07-31 12:12:05 +05:30
nabinhait
8dbd295c9b
bom operations on_delete_row function
2014-07-31 11:40:41 +05:30
nabinhait
d6ff58daa1
Minor fix in customer issue
2014-07-31 11:40:41 +05:30
nabinhait
4859b48c43
message fix
2014-07-31 11:40:41 +05:30
nabinhait
c34329284b
Post gl entries only if there are atleast 2 distinct account head
2014-07-31 11:40:41 +05:30
nabinhait
0ad677045a
Test record fixed for warehouse
2014-07-31 11:40:40 +05:30
nabinhait
c1f65dd863
Validation: Account must belong to the same company
2014-07-31 11:40:40 +05:30
Anand Doshi
35cc320e21
[fixes] Leave Application and Toggle Rounded Totals
2014-07-30 17:00:26 +05:30
Anand Doshi
627f13ea26
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
2014-07-30 13:09:01 +05:30
Anand Doshi
60ee2ea8af
[hotfix] Stock Entry search fields
2014-07-29 23:16:24 +05:30
Anand Doshi
bc708ee4c2
[print] Disable rounded total
2014-07-29 22:24:31 +05:30
Anand Doshi
0e93352c8d
[print] Hide Rate, Amount if Print Without Amount in Delivery Note
2014-07-29 22:03:40 +05:30
Anand Doshi
a12312553b
Merge pull request #1997 from nabinhait/hotfix
...
Fixes
2014-07-29 15:48:04 +05:30
nabinhait
78777e141a
minor fix
2014-07-29 15:19:41 +05:30
Anand Doshi
ad1638e6b6
[print] Improvements to Item grid
2014-07-29 14:38:48 +05:30
nabinhait
0bab81aef9
minor fix in chart of accounts help message
2014-07-29 12:59:47 +05:30
nabinhait
92a1e06665
message fix
2014-07-29 12:46:56 +05:30
nabinhait
079611936f
Delete Payment-to-invoice-matching-tool through patch
2014-07-29 12:12:09 +05:30
nabinhait
d4b92a1d20
Set ignore pricing rule while mapping SI to DN
2014-07-29 11:35:41 +05:30
nabinhait
7555d619f2
Message for frozen stock entries
2014-07-29 11:35:41 +05:30
Anand Doshi
bd748bd115
[hotfix] [patch] Delete old print formats
2014-07-29 08:51:41 +05:30
Anand Doshi
85eefadada
[fix] [print] Print Hide Item Code
2014-07-28 21:17:20 +05:30
Anand Doshi
07d3261467
[hotfix] don't override default print format if specified in POS Sales Invoice
2014-07-28 19:55:13 +05:30
Anand Doshi
11586eda4c
[minor] [fix] taxes print
2014-07-28 17:38:08 +05:30
nabinhait
0a35277c96
Stock reconciliation only for valuation
2014-07-28 16:41:34 +05:30
nabinhait
16317748dd
Issue fixes related to length of the report result
2014-07-28 16:41:34 +05:30
nabinhait
3d48a4ef65
Sales / purchase return: Get party details fix
2014-07-28 16:41:33 +05:30
nabinhait
b739264243
Don't run company trigger on amendment
2014-07-28 16:41:33 +05:30
nabinhait
957971eb1d
Column added 'Reqd by Date' in po_items_to_be_billed report
2014-07-28 16:41:33 +05:30
Anand Doshi
e3c161f0ea
Merge pull request #1995 from anandpdoshi/anand-july-28
...
[minor] apply pricing rule / price list only if item_code
2014-07-28 16:05:42 +05:30
Anand Doshi
39edcbc93b
[minor] apply pricing rule / price list only if item_code
2014-07-28 16:00:19 +05:30
Anand Doshi
beb3e35153
Merge pull request #1989 from dalwadani/develop
...
Improve Arabic Translation
2014-07-28 15:46:22 +05:30
Anand Doshi
57f8dabf59
[minor] Show company name in General Ledger print
2014-07-28 15:28:44 +05:30
Anand Doshi
9c018fe984
[minor] Fixed address listing
2014-07-28 12:59:52 +05:30
Dhaifallah Alwadani
faeca7cf11
Improve Arabic Translation
2014-07-26 05:43:03 +03:00
Anand Doshi
93e2defc96
[fix] Feed listing based on permissions
2014-07-25 14:57:37 +05:30
Anand Doshi
8f49cf7c03
[minor] fixed testcase
2014-07-25 13:02:29 +05:30
Anand Doshi
62b1cbf003
[impact] Limit available functions in jinja environment
2014-07-25 13:02:29 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Anand Doshi
16deabef82
Format Qty
2014-07-25 13:02:28 +05:30
ankitjavalkarwork
82ec488b99
Payment Reconciliation Feature/Tool - Patch
2014-07-25 13:02:28 +05:30
Rushabh Mehta
781ddc3a25
added patch to remove old print formats
2014-07-25 13:02:28 +05:30
Rushabh Mehta
85ff3bcd04
updated pos invoice
2014-07-25 13:01:53 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
Rushabh Mehta
d82352eacc
item grid, added other printable fields in description
2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c
cleanup for print format
2014-07-25 13:01:52 +05:30
Rushabh Mehta
28804bfb62
started sales order print format (new style)
2014-07-25 13:01:52 +05:30
Nabin Hait
5cf3a6bcd2
Merge pull request #1975 from anandpdoshi/anand-july-22
...
Trial Balance and Newsletter sending via Worker
2014-07-25 11:21:13 +05:30
Anand Doshi
329a8ef9a1
Merge pull request #1985 from ankitjavalkarwork/payrec
...
Remove Payment To Invoice Matching Tool
2014-07-24 18:57:46 +05:30
ankitjavalkarwork
344dd3793a
Merge branch 'develop' of https://github.com/frappe/erpnext into payrec
2014-07-24 15:15:12 +05:30
ankitjavalkarwork
d93f4c99e1
Remove Payment To Invoice Matching Tool
2014-07-24 15:14:36 +05:30
nabinhait
ffd57a0565
Fix for company in chart of accounts
2014-07-24 10:40:18 +05:30
Anand Doshi
d1a2ce2750
[minor] is_ajax check in newsletter
2014-07-23 12:51:17 +05:30
Rushabh Mehta
3c78ab5841
[email digest] [fix] [hot] only open to-do items
2014-07-23 10:19:31 +05:30
Anand Doshi
de85a3af15
Newsletter: Bulk Send via worker
2014-07-22 19:49:16 +05:30
Anand Doshi
cb86d597b7
Report: Trial Balance
2014-07-22 19:49:16 +05:30
Nabin Hait
9df4196597
Merge pull request #1970 from ankitjavalkarwork/payrec
...
Added Payment Reconciliation to list accounts.py
2014-07-22 18:24:58 +05:30
ankitjavalkarwork
87633d6be6
Payment Reconciliation Feature/Tool - Patch
2014-07-22 18:14:30 +05:30
ankitjavalkarwork
b5ae643b6e
Payment Reconciliation Feature/Tool - minor change
2014-07-22 15:26:04 +05:30
ankitjavalkarwork
b0cffac79d
Payment Reconciliation Feature/Tool - add in module list
2014-07-22 15:02:59 +05:30
nabinhait
b5f9b5de45
PP Tool: data for required raw materials
2014-07-22 11:38:15 +05:30
nabinhait
c772b3d86a
Purchase invoice: Copy project name from first row on addition of row
2014-07-22 11:38:14 +05:30
nabinhait
7d7123de37
Merge branch 'ankitjavalkarwork-wip_payrec' into develop
2014-07-21 19:23:20 +05:30
nabinhait
97ab902895
payment reconciliation fixes
2014-07-21 19:22:02 +05:30
Anand Doshi
6e15f675a5
Merge pull request #1966 from anandpdoshi/anand-july-21
...
Stock Entry Warehouse prefill, Item autosuggest by description
2014-07-21 18:25:16 +05:30
Anand Doshi
67ecce695d
[fix] Show against account in General Ledger Print Format
2014-07-21 18:13:05 +05:30
Anand Doshi
4c5d7617fb
[minor] Update if missing, source and target warehouse in stock entry detail table, when they are specified in the form
2014-07-21 18:02:22 +05:30
Anand Doshi
7fcb3c9865
[minor] Item query - search by description
2014-07-21 17:51:32 +05:30
Pratik Vyas
649d18c4f7
[minor] fix server error for new production order if sales order is invalid
2014-07-21 17:17:59 +05:30
Nabin Hait
cbf0cb7de7
Merge pull request #1955 from anandpdoshi/financial-statements
...
Balance Sheet and Profit and Loss Statement
2014-07-21 16:44:46 +05:30
Anand Doshi
5f0459c321
Fixes to Financial Statements
2014-07-21 16:13:06 +05:30
ankitjavalkarwork
4dfe19e613
Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec
2014-07-21 14:23:52 +05:30
Rushabh Mehta
1c6313679b
Update material_request.js
2014-07-21 13:08:49 +05:30
Anand Doshi
f457bce0e7
Changed localize_date to formatdate
2014-07-21 12:03:04 +05:30
Anand Doshi
6cc5babd2e
Use include directive to embed common print format
2014-07-21 11:43:19 +05:30
Anand Doshi
db4ba39824
Better handling of ignore zero values
2014-07-21 11:43:19 +05:30
Anand Doshi
825d014616
Commonfied code for Financial Statements and added Profit and Loss Statement
2014-07-21 11:43:18 +05:30
Anand Doshi
fa576a22e3
Balance Sheet
2014-07-21 11:43:18 +05:30
Anand Doshi
059f1e09a8
Balance Sheet - first cut
2014-07-21 11:43:18 +05:30
nabinhait
b1e7bf16ba
Translate while creating India specific accounts
2014-07-19 17:56:43 +05:30
nabinhait
711e8bec3d
Fixes overflow tolerance
2014-07-19 17:00:15 +05:30
nabinhait
b1c5738a67
Fixes overflow tolerance
2014-07-19 16:53:45 +05:30
ankitjavalkarwork
5283e5a7d8
Add Payment Reconciliation Feature/Tool - JS changes1
2014-07-18 15:54:29 +05:30
Anand Doshi
d141cf7293
Minor fix in reorder item
2014-07-18 10:31:34 +05:30
nabinhait
d4e080be29
Country mandatory in company master
2014-07-17 19:32:12 +05:30
ankitjavalkarwork
84fd33ea7a
Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec
2014-07-17 19:11:07 +05:30
ankitjavalkarwork
87e30f68b9
Add Payment Reconciliation Feature/Tool - Complete
2014-07-17 19:10:45 +05:30
Anand Doshi
e8332be285
Merge pull request #1949 from anandpdoshi/anand-july-17
...
Fix in Stock Entry test case
2014-07-17 12:37:42 +05:30
Anand Doshi
fa0db761da
Fix in Stock Entry test case
2014-07-17 12:30:55 +05:30
nabinhait
5f2f955224
From date and to date in general ledger print format
2014-07-17 12:29:56 +05:30
nabinhait
e26204e61d
From date and to date in general ledger print format
2014-07-17 12:22:58 +05:30
nabinhait
fa1cd5faff
Fixed root type of liability accounts
2014-07-17 11:52:50 +05:30
nabinhait
d16081c4d9
Batch no get query fix
2014-07-17 11:08:19 +05:30
nabinhait
143400d444
Batch no get query fix
2014-07-17 11:00:13 +05:30
nabinhait
96cb130263
Default letter head in general ledger and bank reco statement print
2014-07-17 10:56:07 +05:30
Anand Doshi
b8189d7d23
Auto Re-order Item for default warehouse only, if Warehouse wise re-order not specified
2014-07-16 19:24:53 +05:30
Anand Doshi
4b5e89a067
Fixes in Stock Entry test cases
2014-07-16 19:23:58 +05:30
Anand Doshi
f214bfcfc3
Fixes in load defaults of transaction.js
2014-07-16 17:53:02 +05:30
Anand Doshi
d93fa2f78b
Fixes in Stock Entry and test cases
2014-07-16 16:08:15 +05:30
Anand Doshi
e73ed2afae
Setup Wizard: fixed attachment issue #1940
2014-07-16 11:48:51 +05:30
Anand Doshi
c70d2d23a8
Support Ticket: set resolution_date as None if missing
2014-07-16 11:48:51 +05:30
ankitjavalkarwork
540a1eb6d9
Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec
2014-07-15 18:02:08 +05:30
ankitjavalkarwork
d934cd105b
Add Payment Reconciliation Feature/Tool - invoice entries table population
2014-07-15 18:01:36 +05:30
ankitjavalkarwork
ec05d7f8a1
Add Payment Reconciliation Feature/Tool - javascript validation
2014-07-14 18:28:10 +05:30
ankitjavalkarwork
345753ed19
Add Payment Reconciliation Feature/Tool - fetch unreconciled entries
2014-07-14 16:38:27 +05:30
Anand Doshi
c58e6c0dff
Merge pull request #1932 from nabinhait/hotfix
...
Fixes
2014-07-14 14:28:05 +05:30
Anand Doshi
1829bd84d3
hotfix: website_image
2014-07-14 14:26:42 +05:30
nabinhait
7700c62fa8
Minor fix
2014-07-14 14:21:21 +05:30
Anand Doshi
e8c5cb8c9a
Fixed Address and Contact report name
2014-07-14 13:10:24 +05:30
nabinhait
d5fd535909
Minor fix, if no default company
2014-07-14 12:39:50 +05:30
nabinhait
b0a8d000b1
Utility: reset serial no status and warehouse
2014-07-14 11:56:03 +05:30
nabinhait
5c38488590
Utility: reset serial no status and warehouse
2014-07-14 11:44:42 +05:30
nabinhait
614fb750b7
set qty as per stock uom in entire purchase cycle
2014-07-14 10:48:12 +05:30
nabinhait
e6cee7b41f
Expense account can be liability account for stock reconciliation
2014-07-14 10:48:11 +05:30
ankitjavalkarwork
0e57b971ad
Add Payment Reconciliation Feature/Tool - minor changes
2014-07-11 16:08:55 +05:30
ankitjavalkarwork
90b79fcd1f
Add Payment Reconciliation Feature/Tool - minor changes
2014-07-11 15:23:26 +05:30
webnotes
9d31705f75
Merge https://github.com/frappe/erpnext into wip_payrec
2014-07-11 11:21:51 +05:30
webnotes
059922cef1
Add Payment Reconciliation Feature/Tool
2014-07-11 11:20:44 +05:30
Anand Doshi
9b7b9b2e93
Bank Reconciliation Statement Print Format
2014-07-10 18:45:03 +05:30
Anand Doshi
28c4bee0b1
Production Planning Tool - Fixed bom get query
2014-07-10 16:43:31 +05:30
nabinhait
ee8b6f28b8
minor fix
2014-07-10 15:27:27 +05:30
nabinhait
d5fb5d91e9
overflow validation fixed
2014-07-10 15:27:27 +05:30
Anand Doshi
a96cf5b96b
Print Hide other charges calculation
2014-07-10 12:16:39 +05:30
Anand Doshi
287fe0559e
Merge pull request #1920 from anandpdoshi/anand-july-9
...
Fixes in queries
2014-07-09 13:39:51 +05:30
Anand Doshi
9006bba11e
Merge pull request #1919 from nabinhait/hotfix
...
Github issue fixes
2014-07-09 13:39:38 +05:30
Anand Doshi
48d3b54e02
Fixes in queries
2014-07-09 13:15:03 +05:30
Anand Doshi
0c3bb75fd9
Added error_report_email in hooks
2014-07-09 12:59:56 +05:30
nabinhait
7e848b1924
Title mandatory in Note. Fixes #1913
2014-07-09 12:54:56 +05:30
nabinhait
8e4fcca216
Get query fixes in address in contact listing. Fixes #1911
2014-07-09 12:50:50 +05:30
nabinhait
fcfa42d992
Minor fixes #1917
2014-07-09 11:31:11 +05:30
nabinhait
5e0de79c0d
Account validated in general ledger report. Fixed #1912
2014-07-09 11:10:40 +05:30
Anand Doshi
8adb211216
Fixed patch: erpnext/patches/v4_1/fix_delivery_and_billing_status.py
2014-07-09 11:09:53 +05:30
Rushabh Mehta
3f606b6c64
Update project.py
2014-07-09 09:27:02 +05:30
Rushabh Mehta
f31221d0d3
Changed raise Exception
to frappe.throw
2014-07-09 09:13:00 +05:30
nabinhait
89b5e3e2ea
Set discount zero while fetching price list rate
2014-07-08 16:00:25 +05:30
nabinhait
ff2cc1626e
Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list
2014-07-08 15:30:25 +05:30
Anand Doshi
cf6d31cefc
Sales Order: Fixed test case
2014-07-07 18:46:02 +05:30
nabinhait
6c40079139
Update delivery and billing status in SO
2014-07-07 18:02:53 +05:30
nabinhait
2c0c66e756
Update delivery and billing status in SO
2014-07-07 17:56:25 +05:30
nabinhait
bc408d8d0b
Run trigger of company field on onload function, even if company exists
2014-07-07 17:56:24 +05:30
Anand Doshi
37f15ea664
Translations: Indonesian, Japanese and Russian
2014-07-07 17:26:51 +05:30
Anand Doshi
e729516af7
Minor fix
2014-07-07 15:54:11 +05:30
Anand Doshi
4f0a42846c
Catch FiscalYearError in Re-order Item
2014-07-07 15:21:18 +05:30
Anand Doshi
484b092720
BugFix in Purchase Order: Validate minimum order qty using Qty in Stock UOM
2014-07-07 14:03:26 +05:30
Rushabh Mehta
ada6e5a5c4
Merge pull request #1899 from anandpdoshi/anand-july-7
...
BugFix: Maintenance Visit against Customer Issue
2014-07-07 13:57:59 +05:30
Rushabh Mehta
58692fe4d1
sales order status bugfix, add leading / in website_image and removed send_print_in_body_and_attachment
2014-07-07 12:29:43 +05:30
Anand Doshi
3a389788bf
BugFix: Maintenance Visit against Customer Issue
...
+ Map Item details from Customer Issue into Maintenance Visit Purpose Table
+ Map Prev DocType and Prev DocName
+ Changed prevdoc_doctype and prevdoc_docname into Dynamic Link
2014-07-07 12:24:19 +05:30
Anand Doshi
80a988c04f
BugFix: selling_controller.py
2014-07-07 11:35:54 +05:30
Anand Doshi
51f722d20f
Trigger Apply Price List on change of Currency Conversion Rate or Price List Currency Conversion Rate
2014-07-04 15:44:49 +05:30
Anand Doshi
dffec8fb85
Reapply Price List on Change
2014-07-04 15:44:48 +05:30
Anand Doshi
f9cae65df5
Merge pull request #1884 from nabinhait/hotfix
...
Hotfix
2014-07-04 15:31:15 +05:30
Anand Doshi
d2f44006bd
Issues originating due to sql_mode='STRICT_ALL_TABLES'
...
Fixes frappe/frappe-bench#18
2014-07-03 14:32:21 +05:30
nabinhait
23cce731ab
Fixes in action, not defined if called from outside document class
2014-07-03 12:25:06 +05:30
Prakash Hodage
c01f4582de
Description removed for default cost center
2014-07-03 10:50:35 +05:30
Anand Doshi
e673a664ac
Fixes to end_of_life conditions
2014-07-02 18:15:01 +05:30
Anand Doshi
57f76e936a
Merge pull request #1880 from rmehta/fixes-july-2
...
formatting fix in support ticket autoreply
2014-07-02 18:13:55 +05:30
Rushabh Mehta
501b2cc617
duplicate name fix for customer
2014-07-02 18:01:30 +05:30
Anand Doshi
df7f1c17ac
Fixed Employee Birthday Report
2014-07-02 17:35:00 +05:30
Rushabh Mehta
6084a3e63a
formatting fix in support ticket autoreply
2014-07-02 17:13:08 +05:30
Anand Doshi
adfada707d
Automatic Outstanding Writeoff
2014-07-02 17:10:46 +05:30
Anand Doshi
e8533d15b3
Hotfix: Get Balance query
2014-07-01 19:46:22 +05:30
Rushabh Mehta
5f42276dbd
added patch for fixing sales order delivered qty
2014-07-01 18:42:59 +05:30
Rushabh Mehta
c53efc0d6c
fix status_updater - update delivery status in Sales Order from Sales Invoice
2014-07-01 18:42:30 +05:30
Anand Doshi
bc71f737b8
Fix JV Remarks
2014-07-01 18:12:26 +05:30
Anand Doshi
c33ae0c7df
Minor fix: commonified message.
2014-07-01 16:27:24 +05:30
Rushabh Mehta
e9f43251ab
Update journal_voucher.py
2014-07-01 15:19:15 +05:30
Rushabh Mehta
bc920dd2a5
Merge pull request #1868 from anandpdoshi/anand-wip
...
Fix comments
2014-07-01 12:34:17 +05:30
Anand Doshi
da8adea0a9
Fixed customer test
2014-06-30 17:28:52 +05:30
Nabin Hait
669e789bc3
Minor fix in authorization rule
2014-06-30 17:15:52 +05:30
Anand Doshi
02cb347ac7
Fix comments after naming series records rename
2014-06-30 17:05:51 +05:30
Anand Doshi
0e72a87613
Improved test_rename: check if comments are also moved on rename
2014-06-30 17:05:51 +05:30
Anand Doshi
8ac4643fd7
Merge pull request #1867 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-30 13:20:49 +05:30
Anand Doshi
4aa2380de2
Fixed get_sender for Sales and Jobs
2014-06-30 12:19:22 +05:30
Anand Doshi
27b0d16422
Bumped to v4.1.0
2014-06-30 12:09:41 +05:30
Anand Doshi
c459fe21f8
Merge pull request #1865 from frappe/wip-4.1
...
Wip 4.1
2014-06-30 12:00:55 +05:30
Nabin Hait
6c7cd70202
Pricing rule condition if item group missing
2014-06-30 11:50:17 +05:30
Nabin Hait
606c601fc0
Make debit/credit note from sales/purchase return
2014-06-30 11:50:17 +05:30
Nabin Hait
7c9652997b
Item website specification from item group
2014-06-30 11:50:17 +05:30
Nabin Hait
4e4a83bcef
Fixes in maintenance schedule
2014-06-30 11:50:17 +05:30
Anand Doshi
11ada53ed5
Fixes related to Website Route system and other misc fixes
2014-06-28 12:13:11 +05:30
Anand Doshi
5ba7ab0fed
Outgoing Mail Footer patch
2014-06-27 21:00:51 +05:30
Anand Doshi
ebcb654649
Minor: General Ledger Report - print format improvements
2014-06-27 20:53:13 +05:30
Nabin Hait
a0a18d963d
item query fixed in stock entry
2014-06-27 13:04:22 +05:30
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
Anand Doshi
fdfea0c17b
Fixed Recurring Sales Invoice
2014-06-10 17:54:04 +05:30
Anand Doshi
862fe60368
Minor fix in newsletter
2014-06-10 17:15:50 +05:30
Nabin Hait
6a3e97a9f8
Merge pull request #1781 from anandpdoshi/hotfix
...
Reload sales taxes and charges in patch
2014-06-10 16:37:59 +05:30
Anand Doshi
7656377f3f
Show website route for generator via set_intro, fix in Support Email Settings
2014-06-10 15:48:37 +05:30
Anand Doshi
82029be6f9
Reload sales taxes and charges in patch
2014-06-10 14:52:49 +05:30
Nabin Hait
7425634692
minor fix in global defaults
2014-06-10 14:12:28 +05:30
Nabin Hait
6febfca5a6
changed insert after for india related custom fields
2014-06-10 11:21:38 +05:30
Nabin Hait
7cba72a0b7
Pricing Rule: price / discount percentage can not be negative
2014-06-10 11:09:21 +05:30
Nabin Hait
91016ba989
update custom print formats for renamed fields
2014-06-10 10:41:37 +05:30
Anand Doshi
b527e54809
Fixed report: Item wise Price List Rate
2014-06-09 18:08:46 +05:30
Anand Doshi
c01db5fe9c
Save default letterhead
2014-06-09 18:01:14 +05:30
Nabin Hait
d532d2f64f
create custom fields for india specific fields
2014-06-09 16:00:49 +05:30
Anand Doshi
af63d053b1
Also save Global Defaults in System Settings patch
2014-06-09 15:51:12 +05:30
Anand Doshi
be3f914acd
Fixed add address template
2014-06-09 15:18:45 +05:30
Anand Doshi
edb9efd9a6
Fixed manifest and website
2014-06-09 15:11:18 +05:30
Anand Doshi
cdfa9a371d
Export perm for GL Entry and Stock Ledger Entry
2014-06-09 15:11:17 +05:30
Anand Doshi
390efdc884
Fix in HR patch
2014-06-09 15:04:00 +05:30
Nabin Hait
b63e99eb43
Update tax amount after discount in existing documents
2014-06-09 12:49:09 +05:30
Anand Doshi
6f561aa846
Fixed HR patch
2014-06-06 22:10:18 +05:30
Anand Doshi
0aa125304d
Fixed Reset Permissions patch
2014-06-06 20:39:21 +05:30
Anand Doshi
482d29dc53
Fixed Purchase Receipt qty trigger
2014-06-06 20:34:08 +05:30
Anand Doshi
cd0aed993a
Fixed Address Template Patch
2014-06-06 17:37:31 +05:30
Anand Doshi
fc601659f5
Fixed Address Template
2014-06-06 17:07:50 +05:30
Anand Doshi
4a069a1e7f
Changed case in modules.txt
2014-06-06 16:28:03 +05:30
Anand Doshi
04badf7e6e
Hotfix: module name case for HR
2014-06-06 15:29:55 +05:30
Anand Doshi
171c00cfd6
Reload permissions for master and setting documents
2014-06-06 15:13:20 +05:30
Anand Doshi
b5cefa92fa
Improved Fiscal Year validation messages
2014-06-06 15:10:00 +05:30
Anand Doshi
8cead48342
Merge pull request #1756 from rmehta/develop
...
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-06 14:52:22 +05:30
Rushabh Mehta
1989e4fca0
Merge pull request #1755 from nabinhait/v4-hotfix
...
Fixes in trends report
2014-06-06 12:49:34 +05:30
Rushabh Mehta
880b3ef6c0
added qty updating option multi-item selector
2014-06-06 11:45:30 +05:30
Anand Doshi
2ec93590e4
Minor fix in address template
2014-06-06 11:45:30 +05:30
Anand Doshi
5fe69fb556
Fixes
2014-06-06 11:45:29 +05:30
Anand Doshi
290ed09dc6
Update new_address_template.py
2014-06-06 11:45:29 +05:30
Anand Doshi
65018daebc
Minor fix in address template
2014-06-05 18:33:26 +05:30
Rushabh Mehta
0739937fa2
bug: added empty class for sms settings
2014-06-05 18:15:00 +05:30
Anand Doshi
ede8ea52b0
Fixes
2014-06-05 18:06:20 +05:30
Rushabh Mehta
ba83e9cfbe
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-05 17:56:42 +05:30
Nabin Hait
977331806b
Set missing values only in unsubmitted documents
2014-06-05 17:55:00 +05:30
Nabin Hait
86207afe15
Set missing values only in unsubmitted documents
2014-06-05 17:55:00 +05:30
Nabin Hait
704a453b7a
Set missing values only in unsubmitted documents
2014-06-05 17:55:00 +05:30
Nabin Hait
b7438894f6
Fixes in trends report
2014-06-05 17:55:00 +05:30
Anand Doshi
4022586015
Update new_address_template.py
2014-06-05 17:34:59 +05:30
Rushabh Mehta
5036706f81
removed address_title from address and removed test
2014-06-05 16:16:13 +05:30
Rushabh Mehta
c02fbd22fa
removed address_title from address and removed test
2014-06-05 16:16:13 +05:30
Rushabh Mehta
33020a63b8
patch for address template fixes #1749
2014-06-05 16:16:13 +05:30
Rushabh Mehta
eaa2e55d20
patch for address template fixes #1749
2014-06-05 16:16:13 +05:30
Rushabh Mehta
c22e11d483
added address template:
2014-06-05 16:01:55 +05:30
Rushabh Mehta
41471c3b44
fixed description in salary manager
2014-06-05 16:01:55 +05:30
Nabin Hait
c8be8ba42c
function renamed
2014-06-05 15:18:10 +05:30
Nabin Hait
4d4df03f88
Added total debit / credit row in trial balance. Fixes #1313
2014-06-04 19:00:57 +05:30
Nabin Hait
deb6e06336
minor fix
2014-06-04 19:00:56 +05:30
Nabin Hait
c3d1d6a946
cleanup raw materials supplied table for sub-contraction. Fixes #1743
2014-06-04 19:00:56 +05:30
Nabin Hait
1055139c83
get accounts for opening entry
2014-06-04 19:00:56 +05:30
Nabin Hait
19d1e499c3
Removed Purchase in transit report #1435
2014-06-04 19:00:56 +05:30
Nabin Hait
b161eea793
Account balance must be debit / credit, validate if balance already in credit / debit. Fixes #1442
2014-06-04 18:57:53 +05:30
Anand Doshi
85479bcbc0
Fixes for apply user permissions and momentjs
2014-06-04 18:15:43 +05:30
Anand Doshi
ec8240e890
Apply User Permissions optional in Script and Query Reports
2014-06-04 17:48:58 +05:30
Anand Doshi
221dec8cac
transaction.js: calculate only if one entry in table
2014-06-04 17:48:57 +05:30
Anand Doshi
9a0f6f5bb4
Enable Scheduler in System Settings when Setup Wizard is completed
2014-06-04 17:48:57 +05:30
Anand Doshi
38dedf402b
Fixes in patches for migration
2014-06-04 17:48:56 +05:30
Anand Doshi
c280d0655c
Set Employee Name if missing
2014-06-04 17:48:56 +05:30
Anand Doshi
cdc1b640d9
Fixes in user permissions patches
2014-06-04 17:48:56 +05:30
Anand Doshi
37993dd713
Romanian and Korean Translations
2014-06-04 17:48:55 +05:30
Anand Doshi
cd25301607
Translations
2014-06-04 17:48:55 +05:30
Anand Doshi
4985691617
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
69eec9e344
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635
Permission relogication continued
2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7
Started permission relogication
2014-06-04 17:48:52 +05:30
Anand Doshi
ffc28faa51
Merge pull request #1744 from rmehta/develop
...
added multiple item select and allow non purchase items in Material Requ...
2014-06-04 17:47:58 +05:30
Rushabh Mehta
b6843f2087
added multiple item select and allow non purchase items in Material Request of type transfer
2014-06-04 13:10:41 +05:30
Anand Doshi
3f6606acdb
Merge pull request #1702 from pdvyas/put-version-in-file
...
keep version in separate file
2014-06-04 12:28:37 +05:30
Nabin Hait
67d8b91690
Fixes in bank reconciliation statement
2014-06-04 11:18:25 +05:30
Nabin Hait
ce6977ffe6
Minor fixes in fetching item details
2014-06-03 23:02:02 +05:30
Nabin Hait
bc7efa6da6
Parent account mandatory for all non-root accounts
2014-06-03 23:02:02 +05:30
Nabin Hait
b15764ef2c
Translation issue fixed in analytics/grid report
2014-06-03 13:02:39 +05:30
Nabin Hait
abb62c76d8
Removed allocated to field from serach fields in support ticket
2014-06-03 10:50:55 +05:30
Nabin Hait
51b7f322cc
Closing balance fixes in trial balance. Fixes #1730
2014-06-02 18:47:46 +05:30
Anand Doshi
be99b1240c
Merge pull request #1722 from nabinhait/v4-hotfix
...
multiple fixes
2014-06-02 11:09:32 +05:30
Rushabh Mehta
430d132ee0
awesomebar: add tree links
2014-05-31 10:36:42 +05:30
Rushabh Mehta
cc37cc83cd
removed section_style
2014-05-31 10:36:41 +05:30
Nabin Hait
0984f227a8
minor fixes related to path
2014-05-30 19:10:12 +05:30
Nabin Hait
548cf96c44
Minor fixes in sales return
2014-05-30 19:09:59 +05:30
Nabin Hait
0be378af6a
Purchase ordered qty can not be less than minimum order qty. fixes #1529
2014-05-30 15:53:20 +05:30
Nabin Hait
fb988ba834
Salary Slip: pull details from salary struture. fixes #1719
2014-05-30 15:53:20 +05:30
Nabin Hait
e6ddd28067
Don't execute reorder_item, if initial setup not completed. fixes #1668
2014-05-30 15:53:20 +05:30
Nabin Hait
1897e75894
Remove blank lines from uploaded file of attendance #1714
2014-05-30 14:31:10 +05:30
Nabin Hait
c1367d9d10
minor fixes
2014-05-30 11:43:00 +05:30
Nabin Hait
cb9bdf43f6
over billing validation fixed
2014-05-30 11:22:16 +05:30
Nabin Hait
6b1a8e0a40
minor fixes
2014-05-30 11:22:16 +05:30
Nabin Hait
7f32cbeb06
Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials #1688
2014-05-30 11:22:15 +05:30
Nabin Hait
c7253b3a37
Get valuation rate for fg item base don issued item cost + operation cost. #1688
2014-05-30 11:22:15 +05:30
Nabin Hait
7f03e24c55
Valuation rate of raw materials in BOM. #1688
2014-05-30 11:22:15 +05:30
Nabin Hait
66cecf4824
uom trigger issue in stock entry fixes #1712
2014-05-30 11:22:15 +05:30
Nabin Hait
f3552ca737
packing slip fixes #1711
2014-05-30 11:22:15 +05:30
Nabin Hait
3dc6a80198
deleted delivery note packing list wise print format
2014-05-30 11:22:14 +05:30
Nabin Hait
e71159d6ea
Standard Rate field removed from item. Fixes #1688
2014-05-30 11:22:14 +05:30
Nabin Hait
732a7e81a0
Incoming rate in stock ledger and valuation rate in stock balance report. Fixes #1706
2014-05-30 11:22:14 +05:30
Nabin Hait
c3cbe2a30c
minor fixes in sales invoice validation
2014-05-30 11:22:13 +05:30
Nabin Hait
9bc9b8795b
Fixes in stock reconciliation
2014-05-30 11:22:13 +05:30
Nabin Hait
d0605443fb
removed print statement
2014-05-30 11:22:13 +05:30
Nabin Hait
47a8670d37
pricing rule testcase fixes
2014-05-30 11:22:12 +05:30
Nabin Hait
e7546e2305
SMS Settings added in setup and selling module page. Fixes #1693
2014-05-30 11:22:12 +05:30
Nabin Hait
ccb9826afd
pricing list tets case fixes
2014-05-30 11:22:12 +05:30
Nabin Hait
8de61559b0
Minor fixes in sales / purchase analytics. Fixes #1701
2014-05-30 11:22:11 +05:30
Nabin Hait
ea4aa04cc4
Search query for account cleanup
2014-05-30 11:22:11 +05:30
Nabin Hait
a3dd72a759
Pricing Rule
2014-05-30 11:22:10 +05:30
Nabin Hait
62ec60188b
use build_filter_conditions from db_query. Fixes #1679
2014-05-30 11:22:10 +05:30
Anand Doshi
10cb4799bc
Merge pull request #1700 from rmehta/develop
...
Various UI Bug Fixes
2014-05-30 11:12:21 +05:30
Pratik Vyas
8e0438bad4
keep version in separate file
2014-05-28 16:58:55 +05:30
Pratik Vyas
76e48b5c3f
hotfix: update_account_root_type.py patch
2014-05-28 15:22:34 +05:30
Rushabh Mehta
1bf9df7c85
removed about
2014-05-28 13:15:32 +05:30
Anand Doshi
32063bb472
Removed designation 'Director' owing to problems with Greek translation
2014-05-27 22:40:53 +05:30
Rushabh Mehta
f944e819e9
fixes #1581 and added icons to grid reports
2014-05-27 15:22:04 +05:30
Nabin Hait
9c1ae09994
Merge pull request #1689 from rmehta/develop
...
fix to pos invoice
2014-05-26 16:22:03 +05:30
Rushabh Mehta
d82e85d099
fix to pos invoice
2014-05-26 16:01:01 +05:30
Nabin Hait
08dd6af446
Update status based on communication. Fixes #1682
2014-05-26 15:06:42 +05:30
Rushabh Mehta
a7c46e4d83
removed debug in query (packing_slip.py)
2014-05-26 13:35:47 +05:30
Rushabh Mehta
b15d760406
fix to packing slip (validation)
2014-05-26 13:05:19 +05:30
Rushabh Mehta
9f399f139b
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-26 11:40:46 +05:30
Rushabh Mehta
3b0f026522
fix to sales parter
2014-05-24 12:04:13 +05:30
Anand Doshi
8d321446ad
Updated translations
2014-05-23 10:29:37 +05:30
Anand Doshi
c783c2636f
Updated translations
2014-05-23 09:22:12 +05:30
Anand Doshi
5468740042
Fixed setup wizard errors for chinese simplified
2014-05-23 09:21:55 +05:30
Anand Doshi
69e4b16817
Setup Wizard: clear cache on language change
2014-05-22 22:52:36 +05:30
Pratik Vyas
e35a1025c9
hotfix: communication email bug
2014-05-22 18:37:55 +05:30
Rushabh Mehta
0f5601dad4
Merge pull request #1677 from rmehta/develop
...
Added title_field and added ignore_permission while creating Event from Lead
2014-05-22 11:23:03 +05:30
Anand Doshi
c57d7dea8b
Fixed global_defaults_to_system_settings
2014-05-22 11:05:46 +05:30
Rushabh Mehta
a39cae9c2e
added title field to support ticket, lead and employee
2014-05-21 17:34:22 +05:30
Nabin Hait
edf87a258f
Create serial no based on series only if item is serialized
2014-05-21 15:38:56 +05:30
Anand Doshi
d6007e7d9c
Hook: setup_wizard_success
2014-05-21 15:22:15 +05:30
Rushabh Mehta
92ce693e6f
added ignore_permission in Lead for creating Event
2014-05-21 14:59:56 +05:30
Nabin Hait
177fb132b9
description added in setup wizard
2014-05-21 12:39:37 +05:30
Nabin Hait
d811303d7b
minor fix
2014-05-21 12:36:43 +05:30
Nabin Hait
27b12ef1b6
update account root type patch
2014-05-21 11:53:59 +05:30
Nabin Hait
4efc5d74d4
Setup Wizard: company abbr length validation on onchange trigger
2014-05-21 11:53:59 +05:30
Nabin Hait
b5c552faf3
minor fix
2014-05-21 11:53:59 +05:30
Nabin Hait
dec02340e8
reload account doc in root type patch
2014-05-21 11:53:59 +05:30
Nabin Hait
3f80ef0648
reload account doc in root type patch
2014-05-21 11:53:59 +05:30
Nabin Hait
44ae408b36
Income/expense info in email digest
2014-05-21 11:53:58 +05:30
Nabin Hait
0e6554edc1
Root Type field added in account and patch for existing accoutns
2014-05-21 11:53:58 +05:30
Pratik Vyas
5873e50c50
Release 4.0.2
2014-05-20 16:42:01 +05:30
Pratik Vyas
98c09e2a91
Release v4.0.1
2014-05-20 16:17:22 +05:30
Nabin Hait
c49b7f8c63
minor fix
2014-05-20 15:07:18 +05:30
Nabin Hait
956d7868b5
removed print statement
2014-05-20 10:36:14 +05:30
Nabin Hait
85786f3071
Support ticket / lead status based on communication. Fixes #1645
2014-05-19 19:31:40 +05:30
Nabin Hait
2e0620e370
Server side onload functionality in multiple docs
2014-05-19 18:15:58 +05:30
Anand Doshi
6664af9557
Fixed multilingual UOM issue
2014-05-17 00:07:45 +05:30
Nabin Hait
e60853930b
traslation issue fixed in setup wizard and desktop
2014-05-16 19:56:43 +05:30
Nabin Hait
091b48168e
Journal voucher debit != credit #fraction issue
2014-05-16 19:56:43 +05:30
Nabin Hait
ad68d64d93
Leave approver select options in leave application and employee
2014-05-16 19:56:43 +05:30
Pratik Vyas
fa7444ec94
fix shipping rule test cases (copy name with copy_doc)
2014-05-16 15:19:51 +05:30
Pratik Vyas
3d8f8f68d8
Merge pull request #1652 from anandpdoshi/hotfix
...
Do not create Feed when frappe.flags.in_patch
2014-05-16 12:38:24 +05:30
Nabin Hait
a220e5d850
Update global_defaults_to_system_settings.py
2014-05-15 18:36:38 +05:30
Nabin Hait
ac3ba70ed9
Update global_defaults_to_system_settings.py
2014-05-15 18:25:57 +05:30
Nabin Hait
52b5c134fc
Update global_defaults_to_system_settings.py
2014-05-15 18:25:10 +05:30
Nabin Hait
5c50e213ac
Update global_defaults_to_system_settings.py
2014-05-15 18:18:32 +05:30
Nabin Hait
9419575126
Merged language patch with global_defaults_to_system_settings patch
2014-05-15 17:17:58 +05:30
Nabin Hait
d0a915c47a
Global Defaults to system settings. Fixes #1653
2014-05-15 16:42:23 +05:30
Nabin Hait
b5a8cab8df
Valuation Rate column in Stock Ledger report. Fixed #1633
2014-05-15 11:50:46 +05:30
Nabin Hait
bc7659ab90
Employee leave balance report fixes #1647
2014-05-15 11:37:12 +05:30
Anand Doshi
38d5424b21
Do not create Feed when frappe.flags.in_patch
2014-05-14 19:33:21 +05:30
Nabin Hait
ea7e3d6405
Clear default for price_list_currency
2014-05-14 18:52:06 +05:30
Anand Doshi
54b7962eb9
Pass frm to open_mapped_doc
2014-05-14 17:38:45 +05:30
Anand Doshi
39cc1df560
Fixes #1635 , Stock Reconcilation
2014-05-14 15:10:00 +05:30
Anand Doshi
5ce287d611
Setup Wizard width fix for chrome
2014-05-14 13:31:11 +05:30
Anand Doshi
51ba6f816b
Fixed Setup Wizard
2014-05-13 21:02:47 +05:30
Anand Doshi
4c83e407a9
Changed Print Format files to lowercase
2014-05-13 17:58:30 +05:30
Pratik Vyas
b1f212d653
Merge pull request #1638 from anandpdoshi/hotfix
...
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
2014-05-13 17:38:30 +05:30
Anand Doshi
8fe0208fb6
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
2014-05-13 16:52:26 +05:30
Nabin Hait
03f3a8a2ef
Get taxes and charges records from matser. Fixes #1634
2014-05-13 16:38:31 +05:30
Nabin Hait
aade34b0c9
Reports and print formats modified for renamed fields
2014-05-13 16:12:37 +05:30
Nabin Hait
54f0d24d80
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-13 11:33:09 +05:30
Nabin Hait
b76061530e
Daily time log fixes #1614
2014-05-13 11:32:39 +05:30
Anand Doshi
d711209dde
Fixed patches.txt
2014-05-12 19:42:38 +05:30
Nabin Hait
b3bead2f06
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-12 17:46:02 +05:30
Nabin Hait
827480fd2b
import, export and report permission in account and pricing rule
2014-05-12 17:45:37 +05:30
Nabin Hait
0c54e2d0d0
4_0 patch dir renamed to v4_0
2014-05-12 17:44:55 +05:30
Rushabh Mehta
2fdb51f85e
fixes frappe/erpnext#1627
2014-05-12 17:32:36 +05:30
Rushabh Mehta
37f54f9a35
added description to letter head in setup wizard
2014-05-12 16:45:49 +05:30
Anand Doshi
02edae8fac
Added hook: setup_wizard_exception
2014-05-12 12:37:32 +05:30
Nabin Hait
bbfe2517ea
BOM validation message fixed
2014-05-11 18:27:07 +05:30
Nabin Hait
2f50b85f99
Test case fixes for serial no
2014-05-11 13:03:53 +05:30
Nabin Hait
0ff6e3a6bb
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-11 12:11:50 +05:30
Nabin Hait
75e50ee082
Fixes for subcontracting
2014-05-11 12:11:15 +05:30
Nabin Hait
6d5c248402
Test case fixes for serial no
2014-05-11 12:10:57 +05:30
Nabin Hait
5365108ef9
Test case fixes for pos setting
2014-05-11 12:10:17 +05:30
Nabin Hait
7e373010d7
Test case fixes in time log batch
2014-05-11 12:08:39 +05:30
Rushabh Mehta
409c8e9732
removed confirmation date validations (wtf)
2014-05-11 10:01:16 +05:30
Rushabh Mehta
75e11a7270
Merge pull request #1616 from pdvyas/migrate-3to4
...
3 to 4 migration fixes
2014-05-10 22:19:07 +05:30
Pratik Vyas
6e686224eb
fix patches
2014-05-10 22:17:04 +05:30
Pratik Vyas
95f558e7bc
fix update user properties patch
2014-05-10 22:16:39 +05:30
Rushabh Mehta
2667a50334
clear cache before running setup wizard
2014-05-09 19:20:31 +05:30
Rushabh Mehta
9591b8ec93
Merge pull request #1613 from anandpdoshi/deprecate-link-selects
...
Deprecate Select fields with options as link:
2014-05-09 14:09:51 +05:30
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Nabin Hait
a5ac0149af
Merge pull request #1612 from pdvyas/migrate-3to4
...
3 to 4 migration
2014-05-09 12:07:11 +05:30
Pratik Vyas
34e36a233c
Patch changes for 3 to 4 migration
2014-05-09 12:01:25 +05:30
Nabin Hait
d64a952b5d
Stock reco: item and warehouse validation and translation fixes
2014-05-09 11:50:24 +05:30
Nabin Hait
966edff222
minor fix
2014-05-09 10:54:12 +05:30
Nabin Hait
344f4436f1
Create / update raw materials supplied table for sub-contracting
2014-05-08 19:08:20 +05:30
Nabin Hait
5d070753fd
Item managed batch-wise, can not be reconciled through stock reconciliation
2014-05-08 19:08:06 +05:30
Nabin Hait
844dd36ff9
PP tool: get items from SO based on item filter
2014-05-08 19:07:34 +05:30
Nabin Hait
3c5bc544ea
Serial no and batch no field added in purchase receipt item supplied table
2014-05-08 19:07:02 +05:30
Nabin Hait
227db769a0
Item valuation rate on material transfer based on fifo
2014-05-08 19:06:01 +05:30
Anand Doshi
0c85169539
Fixed clear cache for item page
2014-05-08 17:46:00 +05:30
Anand Doshi
3415cdb208
Merge pull request #1604 from anandpdoshi/bugfix-v4
...
Newsletter status display. Fixes #1593
2014-05-08 12:09:29 +05:30
Anand Doshi
08ef467fc6
Fixed moduleview language issue
2014-05-08 11:43:18 +05:30
Nabin Hait
e37b8e6682
fixed conflict
2014-05-07 19:20:56 +05:30
Nabin Hait
23649c6852
fixe in query.py
2014-05-07 19:18:15 +05:30
Anand Doshi
7e1b75a705
Newsletter status display. Fixes #1593
2014-05-07 18:44:02 +05:30
Anand Doshi
f410bd9bf9
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
...
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Nabin Hait
706eb7f2c7
fixed conflict
2014-05-07 15:13:52 +05:30
Nabin Hait
90f2d8d9fc
minor fix
2014-05-07 14:55:09 +05:30
Anand Doshi
dc644c37e6
Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year
...
Naming series by fiscal year
2014-05-07 11:06:36 +05:30
Anand Doshi
4b438eee6d
Revert "Autocreate naming series options based on Fiscal Year"
...
This reverts commit 8a6febbaa5
.
2014-05-07 10:58:39 +05:30
Anand Doshi
8a6febbaa5
Autocreate naming series options based on Fiscal Year
2014-05-06 19:44:22 +05:30
Anand Doshi
8c2dbab878
Changed default naming series options
...
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Nabin Hait
3fcec56f7b
Bulk rename tool fixes #1594
2014-05-06 19:13:46 +05:30
Nabin Hait
a521343063
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-06 18:53:02 +05:30
Nabin Hait
ce4a87ce83
Maintenance schedule: get no of visits and period validation. Fixes #1591
2014-05-06 18:52:36 +05:30
Anand Doshi
7fc9b63dc7
Merge pull request #1590 from anandpdoshi/remove-india-specific-fields
...
Remove India specific fields
2014-05-06 16:48:18 +05:30
Nabin Hait
50e962b279
Special characters allowed in company name. Fixes #1259
2014-05-06 16:46:32 +05:30
Anand Doshi
4b7a6b13ec
Additions to remove India specific fields
2014-05-06 16:41:31 +05:30
Nabin Hait
3190f99ebe
Option for selecting already reconciled entries in bank reconciliation #1310
2014-05-06 16:39:24 +05:30
Anand Doshi
37909b292f
Remove India specific fields
2014-05-06 16:15:56 +05:30
Nabin Hait
5c82014ba9
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-06 14:01:30 +05:30
Nabin Hait
c82e967e97
Cannada translation
2014-05-06 14:01:04 +05:30
Nabin Hait
b63384b3d4
Merge pull request #1588 from nabinhait/v4-hotfix
...
Allow Rename option added in multiple docs. Fixes #1521
2014-05-06 12:34:50 +05:30
Nabin Hait
02d37bbb5a
Allow Rename option added in multiple docs. Fixes #1521
2014-05-06 12:18:50 +05:30
Anand Doshi
728be8c4d4
Merge pull request #1587 from anandpdoshi/bugfix-v4
...
Enable frequently used currencies. Fixes #1561
2014-05-06 12:18:37 +05:30
Anand Doshi
de560aa094
Enable frequently used currencies. Fixes #1561
2014-05-06 12:02:23 +05:30
Nabin Hait
b1285f9fce
Time Log Batch creation from time log list
2014-05-06 11:58:00 +05:30
Nabin Hait
cea4cd4e5f
Pull stock entry difference account from company
2014-05-06 11:57:33 +05:30
Pratik Vyas
4d911db902
Release 4.0.0
2014-05-05 19:14:45 +05:30
Nabin Hait
b99a3517c3
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-05 18:42:07 +05:30
Nabin Hait
98c2a052e5
Fixes in pricing rule testcases #565
2014-05-05 18:41:41 +05:30
Nabin Hait
ac1bc212ea
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-05 18:27:31 +05:30
Anand Doshi
91b451b8ce
Updated validate v3 patch
2014-05-05 18:25:37 +05:30
Anand Doshi
648062d071
Fixes in test cases
2014-05-05 16:46:38 +05:30
Nabin Hait
f2db87a766
Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565
2014-05-05 15:04:55 +05:30
Nabin Hait
53dab55703
Pricing Rule: if multiple rules, ask to resolve conflict #565
2014-05-05 14:49:40 +05:30
Nabin Hait
0c7e28ec9f
Pricing Rule improvements #565
2014-05-05 11:13:36 +05:30
Nabin Hait
ed8a845e83
POS Make Payment dialog box fix #1441
2014-05-05 11:01:32 +05:30
Nabin Hait
d5886f36af
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-05 10:28:20 +05:30
Nabin Hait
f57f0a661a
Stock Entry: pulling items from BOM fixed #1579
2014-05-05 10:27:53 +05:30
Anand Doshi
69e0cb5d6f
Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573
2014-05-04 19:37:45 +05:30
Nabin Hait
6dad4e9e89
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-04 16:02:44 +05:30
Nabin Hait
a096b2004f
Financial analytics graph fix #1542
2014-05-04 16:02:26 +05:30
Anand Doshi
4ab5382d3f
Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564
2014-05-04 11:50:10 +05:30
Rushabh Mehta
24a3ec57e3
update to tests
2014-05-03 16:22:46 +05:30
Anand Doshi
75042fd502
Show Activity entries based on permissions. Completely fixes #1481
2014-05-02 19:44:28 +05:30
Anand Doshi
2b0e4266cf
Go to home page on clicking left arrow in note list
2014-05-02 19:43:11 +05:30
Anand Doshi
ef5407479a
Show Chart of Accounts in Accounts > Documents. Fixes #1559
2014-05-02 19:42:27 +05:30
Anand Doshi
56f29cbb27
Fixed contact page response. Fixes #1557
2014-05-02 18:17:39 +05:30
Nabin Hait
232954d4b9
Fixed updating cost on BOM after submission #1563
2014-05-02 17:51:24 +05:30
Nabin Hait
053a87edf6
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 17:37:38 +05:30
Nabin Hait
296d626e53
Back flush issue fixed in sub contracting #1567
2014-05-02 17:36:13 +05:30
Nabin Hait
bc83b9c1ac
minor fix
2014-05-02 17:03:18 +05:30
Anand Doshi
b71a18cd1e
Leave Allocation Tool and Employee. Fixes #1555
2014-05-02 16:23:51 +05:30
Nabin Hait
2cebf9b499
minor fix #1565
2014-05-02 16:12:07 +05:30
Nabin Hait
ef30932807
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 15:45:52 +05:30
Nabin Hait
6b03914731
asynchronus issue in get_party_details
2014-05-02 15:45:10 +05:30
Anand Doshi
f29bcaf436
Added new fixtures ( Fixes #1540 ). Removed Employee Grade from HR.
2014-05-02 13:55:07 +05:30
Rushabh Mehta
4ceb20e07f
hooks.txt -> hooks.py
2014-05-02 12:15:11 +05:30
Nabin Hait
1e6c32e95f
Address and contact creation from opportunity #1570
2014-05-02 11:42:24 +05:30
Nabin Hait
92c4fc4e19
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 10:27:17 +05:30
Nabin Hait
d341254786
Purchase receipt to purchase invoice item
2014-05-01 17:42:21 +05:30
Anand Doshi
51e6d2228d
Salary Slip - read permission for Employee. Fixes #1553
2014-05-01 16:28:13 +05:30
Nabin Hait
292a254bc1
payment to invoice matching tool disabled temporarily
2014-05-01 15:46:37 +05:30
Nabin Hait
5b98340d15
payment to invoice matching
2014-05-01 15:43:22 +05:30
Nabin Hait
e5bd955f4d
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-01 09:56:14 +05:30
Anand Doshi
d9f0f27cd4
Fixes in test cases
2014-04-30 22:16:25 +05:30
Nabin Hait
dcfad4f645
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-30 20:32:07 +05:30
Nabin Hait
613919325d
Fixes in link field queries
2014-04-30 20:30:33 +05:30
Rushabh Mehta
a15164750d
started client side testing using selenium and other related and unrelated fixes
2014-04-30 19:39:13 +05:30
Nabin Hait
b85a9108eb
Payment to invoice matching tool
2014-04-30 19:32:16 +05:30
Nabin Hait
498ecfc192
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-30 19:31:22 +05:30
Nabin Hait
576f025c84
Payment to invoice matching tool
2014-04-30 19:30:50 +05:30
Anand Doshi
a47bf2ab66
Removed check for duplicate in sales bom, set default income account in Company
2014-04-30 18:54:05 +05:30
Anand Doshi
f62da519d6
Sales BOM Parent Item search - Fixes #1544
2014-04-30 16:50:39 +05:30
Anand Doshi
04f8990c11
Fixed can freeze account check for account doc in client side
2014-04-30 15:02:17 +05:30
Rushabh Mehta
33003c6168
fix for feature setup in install.py
2014-04-30 11:16:02 +05:30
Rushabh Mehta
104c9f465d
updated translations
2014-04-29 18:36:27 +05:30
Rushabh Mehta
d21f55b5d2
fix in naming and feature setup on install:
2014-04-29 16:25:07 +05:30
Nabin Hait
b54307d58e
minor fixes for pos trigger
2014-04-29 13:40:54 +05:30
Nabin Hait
b1777ecfd8
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-29 11:31:37 +05:30
Nabin Hait
17910aa0d6
Removed income and expense related info temporarily from email digest
2014-04-29 11:31:11 +05:30
Anand Doshi
cd17bdffcd
Fixes in account query, fiscal year and cost center
2014-04-28 20:34:48 +05:30
Nabin Hait
6777efa7fa
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-28 17:09:13 +05:30
Nabin Hait
985918d42b
Minor fixes in company and account
2014-04-28 17:08:28 +05:30
Anand Doshi
69aa8ffac4
Fixed as_dict of employee.py
2014-04-28 16:51:34 +05:30
Nabin Hait
2594e41462
Removed Stock Ledger doctype
2014-04-28 16:23:45 +05:30
Nabin Hait
48962e1148
Minor fix in sales funnel report
2014-04-28 15:43:32 +05:30
Anand Doshi
65f83cbae7
BugFix: Sales Order with Order Type as Shopping Cart
2014-04-28 15:33:34 +05:30
Anand Doshi
3b3d55cda2
Usability: Set For Warehouse and Work-in-Progress Warehouse as mandatory, when the user clicks Submit
2014-04-28 15:33:34 +05:30
Anand Doshi
4c90bae16d
BugFix: Item search in Production Planning Tool
2014-04-28 15:33:34 +05:30
Anand Doshi
6916baa299
BugFix: Item search in Stock UOM Replace Utility
2014-04-28 15:33:34 +05:30
Néstor Díaz Valencia
21412ddf65
Update mode_of_payment.py
...
Renamed solves issue #1536
2014-04-28 11:54:31 +02:00
Rushabh Mehta
41d126586e
fix get_server_fields in stock_entry.js
2014-04-27 12:30:20 +05:30
Anand Doshi
8e5b2af0fb
Set conversion_factor in stock entry test case
2014-04-25 19:35:06 +05:30
Anand Doshi
fc79efb97c
Fixes #1532 . Only show an error message for missing Quality Inspection but let the user submit Purchase Receipt.
2014-04-25 18:44:28 +05:30
Anand Doshi
1872312cc6
Deprecated client side mapper: frappe.model.map. Fixes #1530
2014-04-25 18:38:08 +05:30
Anand Doshi
e3f6b6d899
Fixed Opportunity Lost UX
2014-04-25 18:36:06 +05:30
Anand Doshi
69a2c25ca5
Fixed set_query
2014-04-25 18:35:45 +05:30
Anand Doshi
bbffaf78fb
BugFix: use transfer_qty instead of actual_qty in check_duplicate_entry_for_production_order - ported webnotes/erpnext@942ff2583b
2014-04-25 18:31:09 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +05:30
Anand Doshi
7f2d08b03f
Fixed Naming Series page loading fails #1524
2014-04-24 13:51:35 +05:30
Anand Doshi
8c62c40a3d
Fixed Make Sales Order from Quotation #1522
2014-04-24 12:40:19 +05:30
Anand Doshi
78eeacb53c
Fixes in Lead, Opportunity, Quotation, Setup Wizard
2014-04-23 19:15:15 +05:30
Anand Doshi
f50a65294f
Fixed NameError handling
2014-04-23 13:41:28 +05:30
Anand Doshi
b054eb7a4f
Call calculate_taxes_and_totals after mapping
2014-04-22 20:35:22 +05:30
Anand Doshi
4bb87373dc
Fixed default website creation
...
Default website generation was creating company page twice,
which led to duplicate website route validation
2014-04-22 19:50:08 +05:30
Anand Doshi
68d0b7c7ff
get_item_details fixed for Material Request
2014-04-22 19:30:53 +05:30
Anand Doshi
3e41fd1fd3
List route for tree browser based doctypes; Fixes to add child in tree browsers
2014-04-22 18:55:21 +05:30
Rushabh Mehta
4ef1835bee
website updates
2014-04-22 16:52:35 +05:30
Anand Doshi
2944f49974
Setup Wizard: on country select, change date format, save logo in Website Settings > Brand HTML
2014-04-22 16:25:58 +05:30
Anand Doshi
07339fc69e
Fixes in Setup Wizard and Attachments
2014-04-22 15:30:24 +05:30
Rushabh Mehta
3f51705ba4
website cleanups
2014-04-21 22:10:43 +05:30
Anand Doshi
0549b1c5c9
Duplicate supplier delivery number validation in Purchase Receipt should happen per financial year
2014-04-21 15:59:47 +05:30
Anand Doshi
21ae930b4c
Removed controller.py
2014-04-21 15:12:50 +05:30
Anand Doshi
424c033395
Removed controller.py
2014-04-21 15:06:56 +05:30
Rushabh Mehta
40b2b03bcb
demo fixes
2014-04-21 13:43:35 +05:30
Rushabh Mehta
f63513ed38
minor fixes to website
2014-04-21 13:43:35 +05:30
Anand Doshi
9365b616b8
Added an exist check for accounts.utils.get_balance_on
2014-04-21 12:42:21 +05:30
Anand Doshi
cbbf451974
Fixes throw
2014-04-21 11:33:49 +05:30
Anand Doshi
5d591ebe83
Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext
2014-04-18 16:20:07 +05:30
Rushabh Mehta
603e6e21b5
test fixes
2014-04-18 16:17:29 +05:30
Rushabh Mehta
370a024e46
cleaned up sample website and separated fixtures by country
2014-04-18 16:00:41 +05:30
Rushabh Mehta
169c1fd93b
fixed translation for setup-wizard and removed purchase validation for Material Request #925
2014-04-18 10:40:17 +05:30
Anand Doshi
ac32bad25a
Fixes in Taxes, Quotation and Address Territory
2014-04-18 01:32:02 +05:30
Rushabh Mehta
52e618d0b2
updates to Setup Wizard, set language as first input
2014-04-17 18:50:33 +05:30
Anand Doshi
dbfcd328fb
Fixes update_after_submit validation errors
2014-04-17 12:35:04 +05:30
Anand Doshi
0d345c9152
Fixes Item Price duplicate entry validation
2014-04-17 11:40:22 +05:30
Anand Doshi
de1a97d506
Fixes get_voucher_detail for Stock Reconcilation
2014-04-17 11:37:46 +05:30
Anand Doshi
094610d7ce
Fixes in Production, Stock Entry and Stock Controller
2014-04-16 20:23:24 +05:30
Rushabh Mehta
eea802298e
refactor get_voucher_details in stock_controller
2014-04-16 19:38:40 +05:30
Rushabh Mehta
052fe82688
production order: test fixed and added in test_stock_entry.py
2014-04-16 19:20:11 +05:30
Rushabh Mehta
166bc2a0e0
translations: updated German
2014-04-16 18:37:57 +05:30
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
Nabin Hait
47a3c10334
Patch to update old accounts property
2014-03-21 11:26:08 +05:30
Nabin Hait
e67202484d
Imported charts with proper report types
2014-03-21 11:26:08 +05:30
Nabin Hait
e0f98d7202
account properties file added
2014-03-21 11:26:08 +05:30
Nabin Hait
102842ba79
Leave allocation fix
2014-03-21 11:26:08 +05:30
Nabin Hait
73083dc960
Fix related to user_default
2014-03-21 11:26:08 +05:30
Nabin Hait
27bb7892b3
Fixes in pos settings
2014-03-21 11:26:07 +05:30
Nabin Hait
482ffac83f
Set paid amount to zero if not pos
2014-03-21 11:26:07 +05:30
Nabin Hait
439dceebd8
minor fix in landed cost wizard
2014-03-21 11:25:17 +05:30
Nabin Hait
e848914da1
consider all entries against bank account in bank reconciliation statement, even if no reference no
2014-03-21 11:25:17 +05:30
Nabin Hait
d8dcdfbf4f
Warehouse disable option
2014-03-21 11:25:17 +05:30
Nabin Hait
eb1192771f
set root type from parent or child
2014-03-21 11:25:17 +05:30
Nabin Hait
e71cf6d6a1
More country charts imported from openerp
2014-03-21 11:25:17 +05:30
Nabin Hait
037bf6b382
More country charts imported from openerp
2014-03-21 11:25:17 +05:30
Nabin Hait
24e136e3f3
Patch: set root_type for old existing accounts
2014-03-21 11:25:16 +05:30
Nabin Hait
3dfe854108
Rename duplicate account
2014-03-21 11:25:16 +05:30
Nabin Hait
fc37fd8b6e
Set Paid amount and write off amount for pos
2014-03-21 11:25:16 +05:30
Nabin Hait
55a03dbf69
major fixes in importing charts from openerp
2014-03-21 11:22:42 +05:30
Nabin Hait
b93ebaebe4
Added new account types and patch for existing
2014-03-21 11:22:41 +05:30
Nabin Hait
a18bf07920
updated charts json with proper account and root types
2014-03-21 11:22:41 +05:30
Nabin Hait
d7d9d25d71
Country and chart fields added in company master
2014-03-21 11:22:40 +05:30
Nabin Hait
813a93d78d
import chart records into database frm json
2014-03-21 11:22:40 +05:30
Nabin Hait
a69c30edec
country code added
2014-03-21 11:22:39 +05:30
Nabin Hait
d89f3403ac
charts of account doctype added and imported charts json from openerp
2014-03-21 11:22:39 +05:30
Nabin Hait
b77773ca07
fixes in financial statements
2014-03-21 11:22:38 +05:30
Nabin Hait
2b57ecbd6c
fixes for debit_or_credit in account tree grid report
2014-03-21 11:22:38 +05:30
Nabin Hait
53822ae9d0
Account balance must be of type debit/credit
2014-03-21 11:22:38 +05:30
Nabin Hait
49a6f0754e
Removed debit_or_credit field
2014-03-21 11:22:38 +05:30
Nabin Hait
133490a0c5
Removed max roots validation
2014-03-21 11:22:37 +05:30
Nabin Hait
4d713ac5ba
sql injection fixes
2014-03-21 11:22:37 +05:30
Anand Doshi
eb7fea673b
Fixed set_single_defaults during install
2014-03-19 17:10:01 +05:30
Anand Doshi
4b2692182a
Fixes after change in fields handling in Document
2014-03-19 16:58:42 +05:30
Anand Doshi
76f330ca66
Fixed Fiscal Year input issue in Setup Wizard
2014-03-19 15:45:05 +05:30
Anand Doshi
2134d24b36
Removed cloud subscription logic
2014-03-14 15:24:57 +05:30
Anand Doshi
49e0a687b3
Minor Fixes
2014-03-13 20:44:28 +05:30
Nabin Hait
54106807e4
Set paid amount to zero if not pos
2014-03-13 17:26:41 +05:30
Nabin Hait
a8dbb0dd41
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-13 17:23:24 +05:30
Pratik Vyas
65e8676f8b
Profile -> User
2014-03-13 03:09:15 +05:30
Pratik Vyas
5c81f9c44e
check docstatus before updating employee
2014-03-13 02:35:23 +05:30
Rushabh Mehta
7c932003ed
rename Profile to User frappe/frappe#470
2014-03-11 16:15:59 +05:30
Anand Doshi
c379c78fec
Fixed Dropbox, Scheduler, 3to4 migration
2014-03-11 15:17:13 +05:30
Anand Doshi
09a9f4c0c9
Added module to Report doctype
2014-03-07 17:20:22 +05:30
Rushabh Mehta
c12ccdb6ea
bugfix erpnext/frappe#1446
2014-03-06 15:45:45 +05:30
Rushabh Mehta
d8de921c40
fixed erpnext/frappe#1441 and other pos related cleanups
2014-03-06 15:40:22 +05:30
Rushabh Mehta
73f0bf36c1
fixed #1454
2014-03-06 14:45:02 +05:30
Rushabh Mehta
2e7ad8980c
fix for queries
2014-03-06 12:28:47 +05:30
Rushabh Mehta
4541875c81
removed searchfield condition from get_match_cond frappe/erpnext#1457
2014-03-06 11:19:46 +05:30
Rushabh Mehta
0fabc6a841
minor fix
2014-03-06 11:19:46 +05:30
Anand Doshi
2d5727b17b
Ignore mandatory during email pulling
2014-03-05 19:24:07 +05:30
Anand Doshi
b2c2fca8a5
Added Pricing Rule to Accounts, Buying, Selling home
2014-03-05 18:25:10 +05:30
Nabin Hait
9472247b6e
Update stock_entry.js
2014-03-05 17:45:58 +05:30
Anand Doshi
ebdac5db5c
Fix in Pricing Rule Patch
2014-03-05 17:31:37 +05:30
Anand Doshi
7ea8528d50
Fixed Pricing Rule Cleanup Fieldname
2014-03-05 17:27:00 +05:30
Anand Doshi
74d0e40bdc
Moved Notification Count hooks to frappe, employee user id patch, Item ignore restriction fields
2014-03-05 15:24:29 +05:30
Nabin Hait
2d57b0aa52
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-05 10:51:04 +05:30
Anand Doshi
0c4ef64b32
Fixed booboo: Moved website moduleview to framework
2014-03-04 11:15:08 +05:30
Anand Doshi
e30511d315
Email Settings split into Outgoing Email Settings and Support Email Settings
2014-03-03 20:32:20 +05:30
Anand Doshi
64f2ccd9e1
Global Settings in Setup, Sales Master Manager can restrict for Customer
2014-03-03 19:28:30 +05:30
Anand Doshi
6b12b07b33
Fixes to Module Views
2014-03-03 16:05:00 +05:30
Anand Doshi
f5794f1c07
Module Home Pages using Module View
2014-03-03 15:06:34 +05:30
Nabin Hait
8e4640f464
minor fix in report
2014-03-03 12:06:50 +05:30
Nabin Hait
f976143063
pricing rule patch fix
2014-02-28 19:02:27 +05:30
Nabin Hait
177b86a15b
fix in pricing rule
2014-02-28 15:47:22 +05:30
Nabin Hait
e7e615cf18
pricing rule: fixes in testcase
2014-02-28 15:21:49 +05:30
Nabin Hait
13b93ebed8
pricing rule: fixes in testcase
2014-02-28 15:04:05 +05:30
Nabin Hait
3319170805
pricing rule: condition for tree-type docs
2014-02-28 13:04:19 +05:30
Nabin Hait
ed5f423e65
pricing rule: condition for tree-type docs
2014-02-28 13:04:19 +05:30
Nabin Hait
311079a311
Patch: copy customer discount to pricing rule
2014-02-28 13:04:19 +05:30
Nabin Hait
08222150f2
Pricing Rule fixes and reference field in all item table
2014-02-28 13:02:00 +05:30
Nabin Hait
7e8e8ba714
pricing rule
2014-02-28 13:02:00 +05:30
Nabin Hait
c65a0c7197
Allowed stock entry import
2014-02-28 13:02:00 +05:30
Nabin Hait
bc34f3edae
shortage qty column added in stock projected qty report
2014-02-28 13:02:00 +05:30
Nabin Hait
615d342056
Pricing Rule: first commit
2014-02-28 13:02:00 +05:30
Anand Doshi
8462a7691b
Fixed login
2014-02-28 11:53:59 +05:30
Rushabh Mehta
063141d152
added patch for address
2014-02-28 11:37:36 +05:30
Anand Doshi
fb21ce3893
3to4 fixes
2014-02-27 13:18:20 +05:30
Anand Doshi
e9baaa68e7
Changed frappe.conn to frappe.db
2014-02-26 12:35:33 +05:30
Anand Doshi
901f4434fd
Fixed Purchase Invoice test cases
2014-02-25 17:25:28 +05:30
Anand Doshi
0936ae6dca
Fixed company web page creation
2014-02-25 16:21:50 +05:30
Anand Doshi
4362443b6e
Propagate ignore_permissions during mapping from quotation to sales order
2014-02-25 15:42:32 +05:30
Anand Doshi
201dbbd977
Quotation Item Table can be empty
2014-02-25 15:42:32 +05:30
Rushabh Mehta
a6628eee56
rename sitemap to route
2014-02-25 11:08:37 +05:30
Nabin Hait
a1c96de9fc
party related cleanup
2014-02-21 14:45:10 +05:30
Rushabh Mehta
6fbda08583
fixed sitemap patch
2014-02-20 19:03:03 +05:30
Nabin Hait
cda83bba59
Row no fix in stock reconciliation
2014-02-20 15:01:51 +05:30
Nabin Hait
2f8d4451f5
calculate outstanding amount in server side, only if docstatus is 0
2014-02-20 14:59:37 +05:30
Nabin Hait
0f2310690e
fix in fetch item details and supplier non-mandatory to fetch
2014-02-20 11:27:47 +05:30
Pratik Vyas
28da7523be
set single defaults after install
2014-02-19 20:53:45 +05:30
Nabin Hait
ce64afaa51
default value in single doctypes
2014-02-19 19:12:01 +05:30
Nabin Hait
f5bb9ae1b1
default value in single doctypes
2014-02-19 19:02:40 +05:30
Nabin Hait
22831563ff
default value in selling settings
2014-02-19 18:35:54 +05:30
Nabin Hait
32f168617c
default value in global defaults
2014-02-19 18:11:42 +05:30
Nabin Hait
74bbd24b1d
Merge github.com:frappe/erpnext into develop
2014-02-19 17:43:51 +05:30
Nabin Hait
9d1f077922
get lead details in quotation
2014-02-19 17:43:24 +05:30
Rushabh Mehta
e0e3f92019
fixed sales / accounts tree
2014-02-19 12:43:16 +05:30
Nabin Hait
05b28eb161
minor fixes
2014-02-19 11:04:32 +05:30
Nabin Hait
36a4db69b8
price list on_trash function
2014-02-18 15:14:46 +05:30
Pratik Vyas
da0a23e635
remove print in patch, booboo
2014-02-17 14:56:00 +05:30
Pratik Vyas
31affc0e67
bump modified dates for purchase receipt and purchase invoice
2014-02-17 11:36:10 +05:30
Rushabh Mehta
793ba6bd37
-webnotes +frappe 💥
2014-02-14 15:47:51 +05:30
Nabin Hait
8ae051cb39
fixed conflict
2014-02-14 13:42:41 +05:30
Nabin Hait
adeff27f28
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-02-14 13:41:00 +05:30
Nabin Hait
9ea461638e
minor fix
2014-02-14 13:40:41 +05:30
Rushabh Mehta
989b60ae52
removed setup from desktop:
2014-02-14 13:16:39 +05:30
Nabin Hait
a038831c45
validate item of item_price record
2014-02-13 15:54:51 +05:30
Nabin Hait
36028bfb56
minor
2014-02-12 19:09:28 +05:30
Nabin Hait
a87121c6da
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-02-12 17:09:08 +05:30
Nabin Hait
e219d61ed4
patch included in patches txt
2014-02-12 17:08:35 +05:30
Nabin Hait
66b2717c54
Merge pull request #1414 from akhileshdarjee/4.0-hotfix
...
Customer and Supplier dashboard set to company currency
2014-02-12 16:55:17 +05:30
Nabin Hait
eba1bdbcca
minor fixes
2014-02-12 16:04:17 +05:30
Nabin Hait
139dc7b9b2
minor fixes
2014-02-12 14:54:16 +05:30
Nabin Hait
0aa71a5c41
minor fixes
2014-02-12 14:54:15 +05:30
Nabin Hait
5aecc538dd
Letter Head field added in purchase receipt and invoice
2014-02-12 14:54:15 +05:30
Nabin Hait
5f59726903
Rename fields: replaced in html and txt files
2014-02-12 14:54:15 +05:30
Nabin Hait
1eb560130a
Rename fields: amount related fields
2014-02-12 14:54:14 +05:30
Nabin Hait
7979f7ed21
Field Rename: rate field mass replacement
2014-02-12 14:54:14 +05:30
Nabin Hait
a7f757a3f4
Rename fields: initial commit
2014-02-12 14:54:13 +05:30
Nabin Hait
777397489e
Fields renamed in schema
2014-02-12 14:54:13 +05:30
Nabin Hait
436f526102
commonify get_item_details and rename fields to sync selling and purchase
2014-02-12 14:54:12 +05:30
Nabin Hait
c28c86dfd8
Validate duplicate serial nos entry
2014-02-12 14:54:11 +05:30
Nabin Hait
9beffb646d
Validate duplicate serial nos entry
2014-02-12 14:54:11 +05:30
Nabin Hait
f0d29be1d5
Removed on_trash function from support ticket
2014-02-12 14:54:11 +05:30
Akhilesh Darjee
f2b7cd65a9
customer and supplier dashboard set to company currency
2014-02-12 11:29:08 +05:30
Anand Doshi
2735733d1f
Minor fix in setup import
2014-02-11 20:28:11 +05:30
Anand Doshi
93fdc670fe
Fixes in Test Cases
2014-02-11 14:40:21 +05:30
Anand Doshi
d7cc47e3ac
Do not validate Material Request against Sales Order, Moved Setup page to Framework
2014-02-10 17:39:12 +05:30
Anand Doshi
1d7e933590
Fix in Get Job Applications
2014-02-07 20:26:56 +05:30
Anand Doshi
080b64a98f
Fixes in Sales Partner and Support Mails
2014-02-07 19:14:21 +05:30
Rushabh Mehta
c4ec534b06
added config.setup
2014-02-07 19:04:19 +05:30
Rushabh Mehta
22ababbec1
configs
2014-02-07 18:16:11 +05:30
Anand Doshi
7c34f1c472
Test Item Group
2014-02-07 14:52:14 +05:30
Anand Doshi
7bb9c3f125
Nested Set Test using Test Item group
2014-02-06 17:51:18 +05:30
Nabin Hait
a03f654446
Merge pull request #1382 from akhileshdarjee/4.0-hotfix
...
Newsletter can also be sent to employees
2014-02-06 16:02:39 +05:30
Nabin Hait
574c7e7c63
item related cleanup
2014-02-06 15:51:01 +05:30
Pratik Vyas
79499e3615
fix syntax error in material request, merge booboo
2014-02-06 15:25:17 +05:30
Akhilesh Darjee
462740f72b
sales funnel fix
2014-02-06 13:14:15 +05:30
Anand Doshi
3decf4dbc5
Fixes related website hierarchy
2014-02-06 12:50:35 +05:30
Rushabh Mehta
4b41e420c0
cleaned up splash:
2014-02-06 11:02:53 +05:30
Rushabh Mehta
2c545ef1ad
bugfix to feed
2014-02-06 10:38:45 +05:30
Rushabh Mehta
307fac8b78
hooks fixes
2014-02-05 17:04:49 +05:30
Akhilesh Darjee
602fdc0000
patch reloading employee form
2014-02-03 19:32:59 +05:30
Akhilesh Darjee
f1c3537924
webnotes/erpnext#869 newsletter to send to employees
2014-02-03 19:28:36 +05:30
Akhilesh Darjee
81578d2e77
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-02-03 17:48:46 +05:30
Akhilesh Darjee
8f674fe0fb
minor changes
2014-02-03 17:47:50 +05:30
Akhilesh Darjee
abb3af7b30
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-02-03 16:44:14 +05:30
Rushabh Mehta
cc008cc109
commonified get_party_details
2014-02-03 16:14:56 +05:30
Rushabh Mehta
347889b233
merge
2014-02-03 14:49:53 +05:30
Rushabh Mehta
8ed0268b9d
fix to SalesInvoice format
2014-02-03 14:40:01 +05:30
Rushabh Mehta
fa799f7d81
Merge branch '4.0.0-cleanup' of github.com:webnotes/erpnext into 4.0.0-cleanup
2014-02-03 14:38:52 +05:30
Nabin Hait
23c28704d2
Field arrangement in child table
2014-02-03 14:36:59 +05:30
Akhilesh Darjee
dd905fcaba
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-02-03 13:56:10 +05:30
Akhilesh Darjee
53593c9c47
Newsletter allow delete
2014-02-03 13:40:27 +05:30
Rushabh Mehta
8612778136
style fix
2014-02-03 10:45:21 +05:30
Rushabh Mehta
9adcf85a14
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-02-03 10:44:34 +05:30
Akhilesh Darjee
d6d2193f91
newsletter reload
2014-01-31 19:59:25 +05:30
Nabin Hait
bec11fa86e
Newsletter permissions
2014-01-31 17:33:23 +05:30
Nabin Hait
dfae0ea570
minor fix in patch
2014-01-31 17:25:09 +05:30
Nabin Hait
d7fb6dce89
Stock reconciliation: cost center filters
2014-01-31 17:05:09 +05:30
Nabin Hait
7f80485070
Merge pull request #1374 from akhileshdarjee/sms-center
...
SMS center character count
2014-01-31 02:57:35 -08:00
Nabin Hait
45f0c25a6d
Merge pull request #1365 from akhileshdarjee/4.0-hotfix
...
Stay Updated button in website fixed
2014-01-31 02:44:35 -08:00
Nabin Hait
c3211ab394
Merge pull request #1368 from akhileshdarjee/default-tax
...
Default tax for customer and supplier
2014-01-31 02:40:51 -08:00
Akhilesh Darjee
dc45153430
webnotes/erpnext#1221 dont allow duplicate user id in employee
2014-01-31 12:23:13 +05:30
Akhilesh Darjee
4e3b601990
webnotes/erpnext#1188 sms center character count
2014-01-30 19:13:25 +05:30
Nabin Hait
b5be7bab9b
Stock Return: fetch customer and supplier details
2014-01-30 18:47:12 +05:30
Nabin Hait
8dc2c6a16c
Default accounts in company should not be copied
2014-01-30 17:00:09 +05:30
Nabin Hait
ec43e4dd33
Merged with develop
2014-01-30 15:22:10 +05:30
Rushabh Mehta
fcb6b01e4e
cleaned up email
2014-01-30 15:09:05 +05:30
Akhilesh Darjee
e0a1039756
merge conflict fixed
2014-01-30 14:44:35 +05:30
Akhilesh Darjee
4cdb79941b
map charge to taxes and charges in transactions
2014-01-30 13:56:57 +05:30
Nabin Hait
0ff32e73ba
Merged with 4.0.0-wip
2014-01-30 12:41:52 +05:30
Nabin Hait
fe8db590a1
Fixed conflict while merging with develop
2014-01-30 12:32:47 +05:30
Nabin Hait
b87e9f2651
Fixes in fetching party details
2014-01-29 19:51:36 +05:30
Akhilesh Darjee
b665d86292
patch to reload all sales and purchase doctypes and print formats
2014-01-29 17:40:34 +05:30
Akhilesh Darjee
4f7215662d
webnotes/erpnext#1090 set default tax type in customer and supplier
2014-01-29 16:31:38 +05:30
Rushabh Mehta
24da761a17
more updates to party
2014-01-29 15:26:04 +05:30
Akhilesh Darjee
2ced3b07d4
changed fieldname from charge to taxes
2014-01-28 19:16:05 +05:30
Rushabh Mehta
49dd7bee87
added get_supplier_details and commonified invoice functions
2014-01-28 17:43:10 +05:30
Rushabh Mehta
3b432dce88
added listviews
2014-01-28 16:10:15 +05:30
Nabin Hait
21d324c597
Merged with 4.0-wip
2014-01-28 15:52:25 +05:30
Akhilesh Darjee
a7ab20ec78
webnotes/erpnext#912 Stay Updated button in website fixed
2014-01-28 15:50:28 +05:30
Akhilesh Darjee
ffa4769b51
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-01-27 17:32:32 +05:30
Akhilesh Darjee
db4304914c
POS Invoice print format showing inclusive taxes and discount amount
2014-01-27 17:27:39 +05:30
Akhilesh Darjee
86894f3bbf
merge conflict fixed
2014-01-27 15:42:02 +05:30
Rushabh Mehta
1230e3a28b
don't hide customer / supplier links, webnotes/erpenxt#796
2014-01-27 11:02:27 +05:30
Anand Doshi
3f8f4ff6cd
BugFix: Production Planning Tool - get_raw_materials
2014-01-24 21:47:01 +05:30
Anand Doshi
cb39e0878e
Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
...
Conflicts:
config.json
erpnext/accounts/utils.py
erpnext/patches/patch_list.py
erpnext/stock/doctype/price_list/price_list.txt
erpnext/stock/doctype/warehouse/warehouse.py
portal/templates/sale.html
portal/utils.py
selling/doctype/sales_order/templates/pages/order.py
selling/utils/cart.py
selling/utils/product.py
utilities/demo/demo_docs/Fiscal_Year.csv
utilities/demo/make_demo.py
2014-01-24 21:44:36 +05:30
Akhilesh Darjee
a4e0a1c061
minor changes
2014-01-24 19:57:52 +05:30
Rushabh Mehta
e288e5238a
added title_fields for Task, Newsletter
2014-01-24 15:33:42 +05:30
Rushabh Mehta
1cd96a136f
updates for restriction
2014-01-24 11:10:24 +05:30
Nabin Hait
93eab5521c
Minor fix in path
2014-01-23 17:58:03 +05:30
Nabin Hait
4ba95d0b7a
Fix in testcases
2014-01-23 16:45:22 +05:30
Nabin Hait
5ae6a61c4d
Fixes related to appifing shopping cart
2014-01-23 15:33:30 +05:30
Nabin Hait
6a23cfa5cd
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-01-22 15:57:32 +05:30
Rushabh Mehta
7460dcf406
updated Bootstrap
2014-01-22 12:44:46 +05:30
Rushabh Mehta
f96bcf943b
added explicit delete perimssions
2014-01-20 17:52:13 +05:30
Nabin Hait
9e056ec1ce
Auto closing of tickets through schedulers
2014-01-20 17:46:37 +05:30
Rushabh Mehta
cef681942f
merge fix
2014-01-20 17:41:13 +05:30
Nabin Hait
5c6d13a0df
Fixed conflict while merging with develop branch
2014-01-20 17:18:16 +05:30
Nabin Hait
719f2803b3
Fixed conflict while merging with develop branch
2014-01-20 17:01:28 +05:30
Nabin Hait
dc15b4fa8a
Fixed conflict while merging with develop brnach
2014-01-20 16:48:49 +05:30
Akhilesh Darjee
2a79b00700
minor fix
2014-01-15 11:54:05 +05:30
Akhilesh Darjee
6a749e3a8e
removed while loop
2014-01-15 11:43:47 +05:30
Anand Doshi
b9b6a6cea5
Moved webnotes scheduler event hooks
2014-01-13 21:22:23 +05:30
Nabin Hait
f6cf5e0f43
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-cleanup
2014-01-06 17:36:04 +05:30
Akhilesh Darjee
5dd92fd5d6
reload doc in maintenance schedule
2014-01-03 19:14:01 +05:30
Akhilesh Darjee
e27717261d
merge conflict fixed
2014-01-03 18:18:31 +05:30
Akhilesh Darjee
57738a0ff3
flat discount replaced to discount amount
2014-01-03 18:15:07 +05:30
Akhilesh Darjee
5c96b75a68
fixed maintenance schedule
2014-01-02 17:54:12 +05:30
Akhilesh Darjee
064d2ba16a
fixed sr no in maintenance schedule
2014-01-02 17:47:32 +05:30
Rushabh Mehta
b09d9dabc5
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
2014-01-02 11:47:23 +05:30
Nabin Hait
06720dfb90
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-01-01 10:47:18 +05:30
Nabin Hait
a2e0a9b05f
Fliend rearrangemet in tables
2014-01-01 10:45:42 +05:30
Rushabh Mehta
3f7e2729bb
removed demo hooks
2014-01-01 10:45:26 +05:30
Nabin Hait
6260b58a0a
Merge pull request #1253 from nabinhait/4.0.0-wip
...
4.0.0 wip
2013-12-31 21:13:45 -08:00
Anand Doshi
9a4a13cb73
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
2013-12-31 17:38:21 +05:30
Nabin Hait
139aa71666
Fixed conflict while merging with master
2013-12-31 16:09:22 +05:30
Nabin Hait
d3f04d754a
General ledger path fixed
2013-12-31 16:04:48 +05:30
Nabin Hait
432b86344e
Validate account with reference voucher if against voucher mentioned
2013-12-31 15:07:58 +05:30
Akhilesh Darjee
829eda47a8
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount
2013-12-30 12:31:07 +05:30
Anand Doshi
0663ec4a9c
Merge fixes: removed patches, removed Warehouse User
2013-12-27 18:00:28 +05:30
Rushabh Mehta
61bf425935
deleted moves
2013-12-27 17:58:39 +05:30
Akhilesh Darjee
d203aea7c2
[flat discount] flat discount implemented on sales cycle
2013-12-27 17:49:57 +05:30
Rushabh Mehta
c4a0ed63ef
Moved demo to separate app, moved patches folder
2013-12-27 17:30:24 +05:30
Rushabh Mehta
4ac68952e8
Moved patches and fixed method routing in pages
2013-12-27 13:43:40 +05:30
Anand Doshi
e7fc25d6a8
Fixes after permissions merge
2013-12-27 10:49:28 +05:30
Anand Doshi
8e332ffd16
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
...
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
2013-12-26 19:12:51 +05:30
Rushabh Mehta
7334bea3c2
fixed languages, moved framework strings to framework
2013-12-26 14:44:08 +05:30
Rushabh Mehta
caa4380d49
Merge with 3.3.8
2013-12-26 11:07:58 +05:30
Rushabh Mehta
54047780fc
Merge with 3.3.8
2013-12-26 11:07:46 +05:30
Rushabh Mehta
4b6b377134
Removed config.json
2013-12-25 17:38:12 +05:30
Rushabh Mehta
df200f305b
Redesigned templates. Now all templates must be inside templates/pages templates/generators
2013-12-25 15:19:22 +05:30
Rushabh Mehta
3c68488873
Fixes to setup wizard
2013-12-24 18:51:49 +05:30
Rushabh Mehta
b63d550a70
Added Applications page and fixed issues in translations and hooks
2013-12-23 16:09:00 +05:30
Rushabh Mehta
2b08985e16
Translations redesigned webnotes/wnframework#351
2013-12-19 18:27:48 +05:30
Rushabh Mehta
91e9822f65
fixed test cases webnotes/wnframework#351
2013-12-16 18:43:42 +05:30
Rushabh Mehta
c652a6254f
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
2013-12-16 12:48:38 +05:30
Rushabh Mehta
30430796c7
notifications via hooks webnotes/wnframework#351
2013-12-13 15:33:40 +05:30
Rushabh Mehta
6de403f2be
added manifest, hooks and fixed requires webnotes/wnframework#351
2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d
install, web serving, session booting webnotes/wnframework#351
2013-12-12 19:12:19 +05:30
Rushabh Mehta
d2dd83c3a3
fixed template loader webnotes/wnframework#351
2013-12-12 13:57:58 +05:30
Pratik Vyas
1b23208779
[minor] get bundle working, almost
2013-12-12 10:44:38 +05:30
Rushabh Mehta
39bb8e2ed4
step 0: install
2013-12-11 15:32:14 +05:30
Rushabh Mehta
e460aa277b
added setup.py
2013-12-11 11:32:21 +05:30
Rushabh Mehta
b234a3545a
moved config.json inside erpnext
2013-12-11 10:55:55 +05:30
Rushabh Mehta
afea58b7a1
moved modules inside erpnext folder
2013-12-11 10:43:52 +05:30
Rushabh Mehta
55fd5f3ed6
added voucher import tool
2012-09-26 19:00:02 +05:30
Anand Doshi
3c4238fc9c
Merge branch 'master' of github.com:webnotes/erpnext into 1209
...
Conflicts:
public/js/all-app.js
public/js/all-web.js
2012-09-26 12:24:28 +05:30
Nabin Hait
0baf74a139
fixes in gross profit report
2012-09-26 11:38:48 +05:30
Nabin Hait
e89379f8a2
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-26 11:30:59 +05:30
Nabin Hait
9be5717f6c
fixes in gross profit report
2012-09-26 11:30:30 +05:30
Nabin Hait
052a5e85e0
fixes in gross profit report
2012-09-26 11:27:23 +05:30
Anand Doshi
dcbeec1407
fix in bin.py msgprint
2012-09-25 16:07:52 +05:30
Rushabh Mehta
2fa2f7178d
moved directory structure
2012-09-24 19:13:42 +05:30
Anand Doshi
da3d9a3ee0
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-24 18:26:17 +05:30
Anand Doshi
4627867786
fix in general ledger report: account filter options to be filtered by company
2012-09-24 18:16:52 +05:30
Anand Doshi
bc243dee81
fix in general ledger report: account filter options to be filtered by company
2012-09-24 18:03:35 +05:30
Nabin Hait
9b4ffcb507
total gross profit % in gross profit report
2012-09-24 16:12:01 +05:30
Nabin Hait
acd39fd957
rounding issue fixed in gross profit
2012-09-24 15:59:26 +05:30
Nabin Hait
de7fcc66df
updated repost_stock patch
2012-09-24 15:53:01 +05:30
Nabin Hait
9ed7b8bb75
fixed conflict
2012-09-24 15:46:55 +05:30
Nabin Hait
6e6dd1b0d5
reload gross profit report
2012-09-24 15:45:02 +05:30
Anand Doshi
5f76ceb38e
Delete permission for Event doctype to System Manager
2012-09-24 15:41:41 +05:30
Anand Doshi
9ef7bd8494
Delete permission for Event doctype to System Manager
2012-09-24 15:41:27 +05:30
Nabin Hait
41207dbec1
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-24 15:41:16 +05:30
Nabin Hait
e4e88c9715
repost_stock patch and gross profit report
2012-09-24 15:40:56 +05:30
Anand Doshi
e47a6779e9
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-24 14:32:01 +05:30
Anand Doshi
1fc9ae2230
Fixes and Validations for nested doctypes
2012-09-24 14:00:59 +05:30
Rushabh Mehta
feaea28fdf
bulk email: parse html2text only once and autocommit on many writes
2012-09-24 13:09:05 +05:30
Nabin Hait
59f70af79b
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-24 11:23:30 +05:30
Nabin Hait
74f1480e6e
updated incoming_rate in outgoing stock ledger entry
2012-09-24 11:23:05 +05:30
Rushabh Mehta
473f7d6314
removed signin.erpnext.com
2012-09-24 10:05:14 +05:30
Rushabh Mehta
09d84b6575
Stock Ageing & release of Analytics
2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d
added sales analytics
2012-09-21 15:19:40 +05:30
Rushabh Mehta
6ca8054d55
added stock analytics
2012-09-20 19:03:14 +05:30
Anand Doshi
c63f0518d7
removed zoom from grid report
2012-09-20 12:08:47 +05:30
Anand Doshi
09d686f7f6
zoom for stock ledger report
2012-09-19 19:06:38 +05:30
Rushabh Mehta
40a3b46d61
Added code for plot zoom
2012-09-19 17:13:10 +05:30
Rushabh Mehta
b803cbab3d
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 16:48:30 +05:30
Rushabh Mehta
5b5bc97c50
separated tooltip text in plot
2012-09-19 16:47:43 +05:30
Rushabh Mehta
4573515899
added graphs in stock ledger and general ledger
2012-09-19 16:41:19 +05:30
Nabin Hait
2d52bf6a4b
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 16:06:21 +05:30
Nabin Hait
757a785872
sales/ pur invoice listview fix
2012-09-19 16:06:03 +05:30
Anand Doshi
70f76117ac
Show Create Button for link fields which are allowed for submit
2012-09-19 13:06:58 +05:30
Anand Doshi
8bdfaa3438
msgprint fix, company abbreviation length validation
2012-09-19 12:41:06 +05:30
Anand Doshi
39ca69e978
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 12:24:03 +05:30
Anand Doshi
86096ff0b4
syntax error fix
2012-09-19 12:23:35 +05:30
Nabin Hait
684de08120
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 12:22:24 +05:30
Nabin Hait
6a1e40bb46
Date validation in bank reco
2012-09-19 12:21:59 +05:30
Anand Doshi
bb6d06f64a
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 12:18:18 +05:30
Anand Doshi
cdd5cfefd5
make item code read-only after saving
2012-09-19 12:17:41 +05:30
Anand Doshi
e70eeb510e
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 12:12:31 +05:30
Anand Doshi
1953f04e68
added validation that abbreviation should not be more than 5 characters when creating company
2012-09-19 12:12:07 +05:30
Rushabh Mehta
6a6b1de7cd
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-19 12:01:54 +05:30
Rushabh Mehta
823c021e9c
added index patch and updated general_ledger
2012-09-19 12:01:01 +05:30
Nabin Hait
27ec8f1e26
pull all entry of bank where clearance date not mentioned in bank reconciliation
2012-09-19 12:00:11 +05:30
Nabin Hait
6e9f1469d9
pull all entry of bank where clearance date not mentioned in bank reconciliation
2012-09-19 11:55:44 +05:30
Nabin Hait
6112a4d170
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 11:46:23 +05:30
Nabin Hait
52c595dbf1
pull all entry of bank where clearance date not mentioned in bank reconciliation
2012-09-19 11:45:59 +05:30
Anand Doshi
06f4c1a55f
if last purchase not found, take last purchase rate from item
2012-09-19 11:29:32 +05:30
Rushabh Mehta
eb8673ecc6
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-18 18:52:38 +05:30
Rushabh Mehta
2ad0d424a9
Stock Ledger Report
2012-09-18 18:52:05 +05:30
Anand Doshi
05f1d45600
removed unicode literals from patch list
2012-09-18 14:04:22 +05:30
Anand Doshi
8c3cfe076e
get last purchase rate from item if not found from purchase order or receipt
2012-09-18 13:56:47 +05:30
Nabin Hait
9a90c89b3f
removed duplicate function from sales invoice
2012-09-18 13:37:27 +05:30
Nabin Hait
214d62a09a
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-18 11:19:59 +05:30
Nabin Hait
82efcc780b
reset standard transaction series in cleanup_data
2012-09-18 11:19:34 +05:30
Anand Doshi
6b52d77c76
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-09-17 21:24:39 +05:30
Rushabh Mehta
4156523175
added flot for graphs in report_grid
2012-09-17 19:10:36 +05:30
Anand Doshi
8263419691
fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form
2012-09-17 11:35:40 +05:30
Anand Doshi
6450b12881
fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form
2012-09-17 11:34:24 +05:30
Rushabh Mehta
f16b28b92b
moved chart_of_accounts as GridReport
2012-09-17 11:05:59 +05:30
Rushabh Mehta
40c1ac00bc
merge
2012-09-17 10:05:46 +05:30
Rushabh Mehta
4ce6b60fce
updates to general ledger, todo
2012-09-17 10:04:07 +05:30
Anand Doshi
d86e282eda
show only those bank/cash balances which have non-zero value
2012-09-15 22:42:45 +05:30
Anand Doshi
609b25bcdb
refactor email digest
2012-09-15 22:11:23 +05:30
Rushabh Mehta
cfb5466d30
added export to reports using downloadify
2012-09-14 18:12:17 +05:30
Rushabh Mehta
b40e93733c
merge with master
2012-09-14 11:29:52 +05:30
Nabin Hait
ebc3b6a68d
stock ledger added
2012-09-14 11:25:57 +05:30
Rushabh Mehta
c6369046a1
merge
2012-09-14 11:09:46 +05:30
Rushabh Mehta
bf65507939
added watch, check progress
2012-09-14 11:08:53 +05:30
Nabin Hait
9d3f8b9f59
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-14 10:18:09 +05:30
Nabin Hait
266ee64dc7
rebuild account tree before reposting acocunt balance
2012-09-14 10:17:46 +05:30
Rushabh Mehta
2be4c6f8ed
created grid report, report dump and general ledger report
2012-09-13 19:42:28 +05:30
Rushabh Mehta
95e4e1418d
created grid report, report dump and general ledger report
2012-09-13 19:40:56 +05:30
Anand Doshi
e08249f3d5
allow multisort with selectable sort order
2012-09-13 15:39:34 +05:30
Anand Doshi
99e5ac3452
multi sort for stock ledger search criteria
2012-09-13 15:24:19 +05:30
Rushabh Mehta
93e9fdfe48
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-13 12:00:54 +05:30
Rushabh Mehta
4a91f29d0f
updates to gzip, chart of accounts
2012-09-13 11:59:32 +05:30
Rushabh Mehta
fd1c166f5b
late loading js (require) files in localStorage, brought back versions (simpler)
2012-09-13 10:21:29 +05:30
Rushabh Mehta
24ebe3ffdd
merge with master
2012-09-12 19:07:07 +05:30
Rushabh Mehta
588a98a10f
fixes to chart_of_accounts, added opening + pl condition
2012-09-12 19:00:14 +05:30
Rushabh Mehta
aeb5c0fe70
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-12 18:15:26 +05:30
Rushabh Mehta
0fa8e33835
chart of accounts: balances calculation
2012-09-12 18:14:12 +05:30
Rushabh Mehta
ad37f276da
Created Chart of Accounts using Slick Grid and Tree
2012-09-12 17:13:36 +05:30
Nabin Hait
b146353db2
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-09-12 16:15:09 +05:30
Nabin Hait
5337ce8d02
period closing voucher issue fixed
2012-09-12 16:14:23 +05:30
Anand Doshi
d29e06852d
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-12 15:33:50 +05:30
Nabin Hait
303c78ce0e
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-12 15:27:24 +05:30
Nabin Hait
6a6cf5e573
parent account mandatory validation
2012-09-12 15:26:56 +05:30
Anand Doshi
af5e5c9f3a
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-09-12 14:56:28 +05:30
Anand Doshi
d14dc83b88
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-12 14:55:20 +05:30
Anand Doshi
94dd7ef879
show employee name in employee link field in attendance form
2012-09-12 14:53:44 +05:30
Nabin Hait
8fdaa4dd66
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-09-12 14:43:09 +05:30
Nabin Hait
eff2907911
error fixed in period closing entry
2012-09-12 14:42:25 +05:30
Anand Doshi
ae64c46671
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-10 15:46:52 +05:30
Anand Doshi
ff6754ccf4
fix in bin query
2012-09-10 15:46:38 +05:30
Anand Doshi
3b3a42303d
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-10 15:14:16 +05:30
Anand Doshi
0a55a35452
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-10 15:13:45 +05:30
Anand Doshi
bb2bb03bcc
fix in bin reorder item condition
2012-09-10 15:13:22 +05:30
Anand Doshi
4de55b6f6b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-10 14:44:03 +05:30
Nabin Hait
94390d2c3f
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-10 14:37:28 +05:30
Nabin Hait
eb9f6eda02
order type fix in quote/SO
2012-09-10 14:36:49 +05:30
Anand Doshi
ce946afb67
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
public/js/all-app.js
2012-09-10 14:18:17 +05:30
Anand Doshi
9d389461bb
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-10 14:13:57 +05:30
Anand Doshi
bf8f343da7
check match conditions for companies list in chart of accounts/cost center
2012-09-10 14:13:01 +05:30
Nabin Hait
6c8504877b
Fixes in item wise purchase details report
2012-09-10 12:23:06 +05:30
Anand Doshi
21e8447e6c
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-10 12:04:30 +05:30
Anand Doshi
20d82800f3
add delete permission to communication
2012-09-10 12:03:31 +05:30
Anand Doshi
1971ca9ecb
renamed Report to report
2012-09-10 11:40:06 +05:30
Anand Doshi
10f4ae814c
renamed Report name to small case name
2012-09-10 11:34:51 +05:30
Anand Doshi
88411eddb8
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-09-10 11:32:17 +05:30
Anand Doshi
0dab087be1
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
public/js/all-app.js
2012-09-10 11:31:18 +05:30
Anand Doshi
38ab4ae3ac
add stock report permission for accounts manager
2012-09-10 11:23:51 +05:30
Anand Doshi
d7774d0ab0
fix in email digest
2012-09-07 14:43:39 +05:30
Rushabh Mehta
93af75a160
added unicode literals in patch
2012-09-07 10:57:14 +02:00
Nabin Hait
ea4e6b0f0c
reload stock ledger report
2012-09-07 12:15:29 +05:30
Nabin Hait
56419e0d79
Stock ledger report new version
2012-09-07 12:11:41 +05:30
Nabin Hait
f28f4c7a89
section hide_unhide issue fixed
2012-09-07 11:59:05 +05:30
Rushabh Mehta
62aa086e80
todo: assignment notification fix
2012-09-07 10:05:13 +05:30
Rushabh Mehta
38cc3d6534
todo: do not send message to if assigned to self
2012-09-07 09:54:19 +05:30
Anand Doshi
e67bcc38b4
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-06 17:51:05 +05:30
Anand Doshi
f480dc9d2e
fix in opportunity to quotation fetch
2012-09-06 17:50:44 +05:30
Anand Doshi
3d498ccfb1
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-06 07:56:07 +05:30
Anand Doshi
f03e3bb06b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-06 07:55:19 +05:30
Anand Doshi
76ef96f24f
begin transaction after commit in support ticket
2012-09-06 07:53:37 +05:30
Rushabh Mehta
0a0be777a0
website dropdown update
2012-09-05 13:48:45 +05:30
Anand Doshi
4ae7328a6c
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-05 13:27:27 +05:30
Anand Doshi
518090f38e
autocommit for repost stock due to wrong packing list patch
2012-09-05 13:26:53 +05:30
Nabin Hait
d948e9b15c
reload doc before auto nification
2012-09-05 12:59:07 +05:30
Rushabh Mehta
a9302b01d1
added dropdowns to website toolbar
2012-09-05 12:32:19 +05:30
Anand Doshi
e642805882
changed date displayed in transaction listing from modified date to transaction/posting date
2012-09-03 13:32:25 +05:30
Anand Doshi
eb3089e6e3
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-31 16:57:04 +05:30
Anand Doshi
b4ea4adeec
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/setup/doctype/price_list/price_list.py
2012-08-31 16:56:44 +05:30
Anand Doshi
c53a0ffe34
by default, communication content is of type 'Text' instead of 'Text Editor'
2012-08-31 16:54:59 +05:30
Anand Doshi
41cd5a68f4
autocommit for price list update
2012-08-31 13:57:22 +05:30
Anand Doshi
b211a41547
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-31 13:39:58 +05:30
Anand Doshi
29abc389eb
run communication list if a new communication is added
2012-08-31 13:39:18 +05:30
Anand Doshi
00d3c7c67d
open communication in dialog
2012-08-31 13:25:03 +05:30
Anand Doshi
fa97e8c783
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/search_criteria/cash_flow_statement/__init__.py
erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py
public/js/all-app.js
2012-08-31 12:09:02 +05:30
Nabin Hait
245f920772
removed cash flow statement
2012-08-31 11:01:21 +05:30
Anand Doshi
62a3881837
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-30 18:17:20 +05:30
Nabin Hait
26da576f1e
patch list updated
2012-08-29 12:09:35 +05:30
Nabin Hait
fff16c337d
fixes in over billing validation
2012-08-29 12:07:32 +05:30
Nabin Hait
9c043b2f51
Billed amount in SO and DN based on export amount and patch for it
2012-08-29 11:46:12 +05:30
Nabin Hait
12e1a5f983
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-28 10:50:45 +05:30
Nabin Hait
f826eecfc7
fixes in bom: updating cost
2012-08-28 10:50:18 +05:30
Anand Doshi
ebcb8b3fac
fix in change password of profile settings page
2012-08-27 15:49:27 +05:30
Anand Doshi
9ee4adb27a
send newsletter as owner
2012-08-24 15:18:48 +05:30
Anand Doshi
ad86d0f474
show message after sending test email
2012-08-24 14:47:30 +05:30
Anand Doshi
c6800106fb
added newsletter listing
2012-08-24 14:47:10 +05:30
Anand Doshi
3f8277b6bb
added newsletter link in support home page. also hide naming series after save
2012-08-24 14:23:27 +05:30
Anand Doshi
9fdc4abced
added newsletter feature
2012-08-24 14:13:42 +05:30
Anand Doshi
998d39f71b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-24 12:17:33 +05:30
Anand Doshi
ba278000d7
edit / add nodes allowed in sales browser, only if user has valid permissions
2012-08-24 12:15:44 +05:30
Anand Doshi
d0fcdf6ec1
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-23 18:34:46 +05:30
Anand Doshi
763e4c93bc
added permission checking to show add child, edit and view ledger links
...
in chart of accounts
2012-08-23 18:34:04 +05:30
Anand Doshi
5513775326
fix in number of comments
2012-08-23 17:17:46 +05:30
Anand Doshi
005ab30644
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-23 17:17:24 +05:30
Anand Doshi
7e657d79fd
global date format for blog comments
2012-08-23 17:15:13 +05:30
Anand Doshi
d297b88f60
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/patches/patch_list.py
2012-08-23 15:26:38 +05:30
Anand Doshi
6db2ac51e6
changed blog comments date format to global date format i.e. 1 January 2012
2012-08-23 15:24:21 +05:30
Anand Doshi
297f37da03
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-22 14:59:14 +05:30
Anand Doshi
688b712bda
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-22 14:58:03 +05:30
Anand Doshi
73c6542e6c
minor fix in communication.js
2012-08-22 14:57:35 +05:30
Nabin Hait
fd3f24f4be
customer name should come in recurring invoice print format instead of customer id
2012-08-20 11:43:55 +05:30
Anand Doshi
25dd92dbdb
coerce markdown2.UnicodeWithAttrs to unicode in blog comments
2012-08-17 23:36:11 +05:30
Anand Doshi
5fc48f566f
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
2012-08-17 11:48:34 +05:30
Nabin Hait
daba7c40a6
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-17 11:00:42 +05:30
Nabin Hait
0170b2b4bc
default purchase taxes and charges master will be automatically fetched in pur transactions
2012-08-17 11:00:15 +05:30
Anand Doshi
7b20428976
merged master
2012-08-16 17:10:39 +05:30
Anand Doshi
1467a059ed
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-16 17:09:37 +05:30
Anand Doshi
37b1b88710
fix in email settings: json.loads defaults to unicode string, hence encode string for smtp login
2012-08-16 17:09:13 +05:30
Nabin Hait
7e555e9f78
Update erpnext/accounts/doctype/cost_center/cost_center.py
2012-08-14 16:42:30 +05:30
Nabin Hait
f039c8b58f
get_query for invoice in c-form
2012-08-14 15:38:17 +05:30
Anand Doshi
0851b4b397
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-14 14:56:09 +05:30
Anand Doshi
46f8b50c8c
added Expense Claim Type link in HR Home page
2012-08-14 14:53:38 +05:30
Nabin Hait
22aa31ead2
updated profile permission
2012-08-13 13:15:36 +05:30
Rushabh Mehta
c3de42c892
bugfix: blog
2012-08-13 11:31:27 +05:30
Rushabh Mehta
fa0e252d4b
blog comments fix, markdown and not sent multiple times
2012-08-13 11:09:21 +05:30
Anand Doshi
6547375a2b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/buying/doctype/purchase_common/purchase_common.js
2012-08-10 15:42:50 +05:30
Anand Doshi
544b0f64d1
cascade project name to other items, if selected in one item during purchase cycle
2012-08-10 15:37:54 +05:30
Anand Doshi
241437995f
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/setup/doctype/company/company.txt
2012-08-10 12:58:48 +05:30
Anand Doshi
f08cbe185d
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-10 12:48:46 +05:30
Anand Doshi
6810979dab
Company Form: do not hide 'Default Settings' section break for a new company, as it contains a mandatory field 'Default Currency'
2012-08-10 12:38:48 +05:30
Nabin Hait
4d0cba8249
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-09 16:24:47 +05:30
Nabin Hait
cd4918736a
error fixed in account browser
2012-08-09 16:24:20 +05:30
Anand Doshi
8456eabed8
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-09 12:17:44 +05:30
Anand Doshi
c6cf4a2630
do not display mouse as a clickable pointer when hovering on description in todo list
2012-08-09 12:16:03 +05:30
Anand Doshi
63fee973d7
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-09 11:34:47 +05:30
Anand Doshi
c4df355edc
removed msgprint in get_pos_details of sales invoice
2012-08-09 11:33:56 +05:30
Rushabh Mehta
899fe5d3f0
links enabled in todo
2012-08-08 15:30:19 +05:30
Rushabh Mehta
02f459abcf
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-08-08 14:29:55 +05:30
Rushabh Mehta
0f0d8850d0
merged with master (project cleanup)
2012-08-08 14:28:24 +05:30
Rushabh Mehta
a8733daf80
fix to project_list
2012-08-08 14:26:53 +05:30
Rushabh Mehta
aff1599fe5
cleanup to projects and tasks and now embedding gantt chart inside project
2012-08-08 14:19:33 +05:30
Rushabh Mehta
2937e7e842
task cleanup: moved allocated_to -> assigned_to, autoname is now task (istead of tic)
2012-08-08 12:54:47 +05:30
Anand Doshi
a5c7bd34d0
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-08-08 10:54:56 +05:30
Anand Doshi
0cedc1cc9c
removed reply_to while sending email in email digest
2012-08-08 10:54:11 +05:30
Rushabh Mehta
17588987a4
file upload should not be decoded
2012-08-08 10:37:02 +05:30
Rushabh Mehta
22fbea975f
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-08-08 10:07:39 +05:30
Rushabh Mehta
bf8cac53c7
pre, code style fix
2012-08-08 10:05:51 +05:30
Rushabh Mehta
bc26218889
added jQuery.Gantt
2012-08-08 10:02:55 +05:30
Rushabh Mehta
47ba1d144a
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-07 16:38:00 +05:30
Rushabh Mehta
586c6f3cbe
calendar: links to ref document
2012-08-07 16:36:40 +05:30
Rushabh Mehta
c2ef064ebb
todo page background bugfix
2012-08-07 16:36:10 +05:30
Rushabh Mehta
df196c12a9
projects: milestones have events, tasks have events with better description
2012-08-07 16:35:27 +05:30
Anand Doshi
7b64b96676
renamed report folder
2012-08-07 15:30:40 +05:30
Anand Doshi
ebcb3c02d0
fixes in supplier quotations report patch
2012-08-07 15:24:46 +05:30
Anand Doshi
26dc1b776a
fix in report: supplier quotations after merge with unicode
2012-08-07 15:17:53 +05:30
Anand Doshi
4e2feb2b28
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-07 15:14:07 +05:30
Anand Doshi
883285f503
fix in supplier quotations patch
2012-08-07 15:13:48 +05:30
Anand Doshi
e81c07ff4d
appended unicode literals import after merge
2012-08-07 15:08:52 +05:30
Anand Doshi
16ad50f641
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/stock/doctype/item/item.txt
2012-08-07 15:07:56 +05:30
Anand Doshi
f6624257ad
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-07 15:06:17 +05:30
Anand Doshi
e30d5f833e
New Report: Supplier Quotations
2012-08-07 15:05:42 +05:30
Rushabh Mehta
6252c13ec8
added code style and mardown in todo
2012-08-07 12:53:49 +05:30
Rushabh Mehta
e6ecb06001
added markdown reference page
2012-08-07 12:48:41 +05:30
Rushabh Mehta
c7dbe293c3
updates to kb: unanswered questions show in desktop, questions query moved to server-side
2012-08-07 12:12:55 +05:30
Nabin Hait
e343393d73
add/drop index if index key not exists / exists
2012-08-07 10:53:52 +05:30
Anand Doshi
a742d32c96
added unicode literals import to supplier quotation patch
2012-08-06 20:03:49 +05:30
Anand Doshi
0d0efcfd14
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-06 19:56:03 +05:30
Anand Doshi
b8219aa4f0
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
public/js/all-app.js
public/js/fields.js
2012-08-06 19:55:43 +05:30
Anand Doshi
8ce2ac3f0e
supplier quotation release patch
2012-08-06 19:53:31 +05:30
Anand Doshi
65078d8a2e
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-06 18:34:26 +05:30
Anand Doshi
3e92c00dd9
removed stock uom related fields from supplier quotation item, as there is no need to track stock uom details in a suppleir quoation
2012-08-06 18:29:46 +05:30
Anand Doshi
793ec9f857
removed method get_uom_details from Supplier Quotation, as there is no need to track Stock UOM in a quotation
2012-08-06 18:29:03 +05:30
Anand Doshi
6ea82c07fe
added button, method in Purchase Request form to make Supplier Quotation
2012-08-06 18:27:58 +05:30
Anand Doshi
72f5a05ac0
added fields 'Supplier Quotation' and 'Supplier Quotation Item' in Purchase Order Item to track parent
2012-08-06 18:27:11 +05:30
Anand Doshi
b6029d2d13
added button, method in Purchase Order to fetch Supplier Quotation Items
2012-08-06 18:26:07 +05:30
Anand Doshi
da85a8363f
call set missing values on load and contact section toggle on refresh of purchase order form
2012-08-06 18:24:56 +05:30
Anand Doshi
280e0ce263
added function to hide/unhide contact section of a buying form
2012-08-06 18:23:45 +05:30
Anand Doshi
41c4d19279
added button to make Purchase Order from Supplier Quotation
2012-08-06 18:22:59 +05:30
Anand Doshi
26e5f3dec0
DocType Mappers: Purchase Request-Supplier Quotation and Supplier Quotation-Purchase Order
2012-08-06 18:20:08 +05:30
Rushabh Mehta
aaa75496e2
added email chain on blog comment and number of comments
2012-08-06 15:22:17 +05:30
Rushabh Mehta
24fabf3b73
cleaned up source from lead
2012-08-06 15:21:35 +05:30
Rushabh Mehta
a146db2b58
build
2012-08-06 14:31:53 +05:30
Nabin Hait
ed8049ec19
fixes in patch: considered over delivery in reserved qty calculation
2012-08-06 14:31:45 +05:30
Rushabh Mehta
a49a552a37
merge
2012-08-06 14:30:31 +05:30
Rushabh Mehta
48f5f40ae2
moved recurring to daily from every time
2012-08-06 14:19:11 +05:30
Anand Doshi
a4f6529801
in item's update page name, if item name is null, create page name with only the name
2012-08-06 13:42:19 +05:30
Anand Doshi
1c2b192be6
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
2012-08-06 13:36:19 +05:30
Nabin Hait
337fef0859
call item on_update from UOM Replace Utility
2012-08-06 13:33:32 +05:30
Anand Doshi
e64d900322
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
2012-08-06 13:23:16 +05:30
Nabin Hait
fd03762445
call item on_update from UOM Replace Utility
2012-08-06 13:18:32 +05:30
Rushabh Mehta
f83159edbe
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-08-06 10:17:38 +05:30
Anand Doshi
326f88cce6
fixed patch: repost stock due to wrong packing list
2012-08-03 19:19:23 +05:30
Anand Doshi
fea3b64dd0
fixed patch: repost stock due to wrong packing list
2012-08-03 19:14:42 +05:30
Anand Doshi
df902d1a0c
patch: repost stock due to wrong packing list entries - optimized query using index and subqueries
2012-08-03 19:11:11 +05:30
Anand Doshi
786444e6bf
changed document_type of 'Communication' to 'Master' to enable importing
2012-08-03 16:15:39 +05:30
Rushabh Mehta
49dc5da0dc
refactor unicode changes and merge with master with refactored email
2012-08-03 16:02:24 +05:30
Anand Doshi
b7cc66384d
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-03 14:19:36 +05:30
Anand Doshi
3d549775e1
mark 'Supplier Quotation' as a beta feature
2012-08-03 14:19:05 +05:30
Rushabh Mehta
c0fded82e6
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-03 14:18:05 +05:30
Rushabh Mehta
52006ca83d
bugfix in scheduler
2012-08-03 14:15:25 +05:30
Rushabh Mehta
e5984873e6
added standard mail footer and function to get monthly bulk mail limit
2012-08-03 14:15:07 +05:30
Rushabh Mehta
ba54cf6eef
added 'Email Send' feature in blog to send blog by mail to all subscribers
2012-08-03 14:14:02 +05:30
Rushabh Mehta
5f21cc03e6
created files for blog subscription to be embedded in blog and blog_page
2012-08-03 14:13:30 +05:30
Rushabh Mehta
4b3b25e1d6
aded 'add_subscriber' method to be called from website
2012-08-03 14:10:59 +05:30
Rushabh Mehta
384b61749e
added 'blog_subscriber' and 'unsubscribed' fields
2012-08-03 14:09:32 +05:30
Nabin Hait
175771c699
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-03 08:40:14 +05:30
Nabin Hait
8292691470
stock repost patch
2012-08-03 08:39:17 +05:30
Anand Doshi
e69c7f487f
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-02 18:53:31 +05:30
Anand Doshi
a67a74fee1
supplier quotation, project shift patch
2012-08-02 18:53:00 +05:30
Rushabh Mehta
f0018b5e05
added unsubscribed fields in Lead and Contact and cleaned up sendmail function
2012-08-02 18:03:12 +05:30
Rushabh Mehta
a4fe7180f4
html generation moved from web.py to web_cache.py so it can be called from other places as a response from server.py
2012-08-02 13:07:23 +05:30
Nabin Hait
dd9d4bbdea
repost stock patch due to wrong packing list
2012-08-02 10:56:40 +05:30
Anand Doshi
cf546d547d
fix in quotation item's get query
2012-08-01 12:05:13 +05:30
Anand Doshi
96efd2ba9b
fix in quotation item's get query
2012-08-01 12:00:30 +05:30
Anand Doshi
33987a0ad2
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-07-31 19:18:44 +05:30
Anand Doshi
5c42d5d2cf
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-31 19:15:31 +05:30
Anand Doshi
c7d5fc4952
fix in recent blog list link
2012-07-31 19:15:01 +05:30
Anand Doshi
59d37c4bcb
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/hr/doctype/expense_claim/expense_claim.js
erpnext/patches/patch_list.py
2012-07-31 17:30:49 +05:30
Nabin Hait
f9360ce562
filter on actual qty in stock level report
2012-07-31 17:27:11 +05:30
Nabin Hait
d614a6ea38
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-31 14:12:41 +05:30
Nabin Hait
8d97290c06
updated bin permission
2012-07-31 14:12:23 +05:30
Anand Doshi
fd684ec247
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-31 13:58:16 +05:30
Anand Doshi
29c8b3b487
bug fix: strip serial no field before validation to check truthy value
2012-07-31 13:57:06 +05:30
Nabin Hait
d8959bfecd
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-31 12:08:00 +05:30
Nabin Hait
76697a5c3b
added filter on item group and brand
2012-07-31 12:07:40 +05:30
Anand Doshi
0029ac9f3c
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-31 11:46:57 +05:30
Anand Doshi
054cf3907f
removed validate approver code
2012-07-31 11:46:41 +05:30
Nabin Hait
9b5fc1f833
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-31 11:27:14 +05:30
Nabin Hait
87b6d656df
sanctioned amt auto set equals to claimed amt
2012-07-31 11:23:44 +05:30
Anand Doshi
ccee92e5c0
fixes in header decoding in receiving support ticket email
2012-07-31 10:56:24 +05:30
Anand Doshi
3e7a143539
fixes in header decoding in receiving support ticket email
2012-07-31 10:54:56 +05:30
Anand Doshi
396628e7ea
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
2012-07-27 14:45:24 +05:30
Anand Doshi
85632b71c9
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-27 14:40:19 +05:30
Anand Doshi
b3a4c09e07
added guest read permission to blog
2012-07-27 14:39:27 +05:30
Anand Doshi
66f90687e9
import unicode_literals where missing
2012-07-27 14:29:29 +05:30
Nabin Hait
4572182939
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-27 10:54:43 +05:30
Nabin Hait
f5b3a44da1
SO and DN mandatory only for stock item if made mandatory in global defaults
2012-07-27 10:54:18 +05:30
Nabin Hait
3d72da568d
SO and DN mandatory only for stock item if made mandatory in global defaults
2012-07-27 10:51:51 +05:30
Rushabh Mehta
0fa628bf86
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
public/js/report-legacy.js
2012-07-26 15:46:13 +02:00
Anand Doshi
adc6c7c02b
moved add comment button outside comments div
2012-07-26 19:11:44 +05:30
Anand Doshi
80b8393338
fixes in email validation for recurring invoice
2012-07-26 19:01:16 +05:30
Anand Doshi
e87482ac86
Fixed: Lead Lost Reason message
2012-07-26 12:48:26 +05:30
Rushabh Mehta
39c0aa70ba
Redirect to new manual page
2012-07-26 12:39:07 +05:30
Nabin Hait
74b30c15ea
Update erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
2012-07-25 18:14:46 +05:30
Nabin Hait
e8ff96565c
validate notification_email_ids in recurring invoice and if user is administrator set email id from profile
2012-07-24 10:59:31 +05:30
Anand Doshi
9b8fca9d75
new patches for unicode release
2012-07-23 13:10:33 +05:30
Anand Doshi
6a223fe77e
fixes in receive email
2012-07-23 12:51:50 +05:30
Nabin Hait
e9a62d1236
reload trial balance report
2012-07-23 11:46:37 +05:30
Anand Doshi
7118086658
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-07-23 11:28:10 +05:30
Anand Doshi
dbe31be55c
deprecated bulk rename tool
2012-07-20 18:11:41 +05:30
Anand Doshi
76ec66dd65
fixes for unicode
2012-07-20 18:11:30 +05:30
Nabin Hait
454e268109
Recurring Invoice repititive mail sending issue fixed
2012-07-20 17:17:32 +05:30
Nabin Hait
93e82b8742
error fixed in landed cost wizard
2012-07-20 10:40:14 +05:30
Anand Doshi
1703cc89b4
fixes for unicode
2012-07-19 20:31:56 +05:30
Anand Doshi
486f9dfcec
added unicode_literals import at start of each file
2012-07-19 13:40:31 +05:30
Nabin Hait
bbc2d44241
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-19 09:15:49 +05:30
Nabin Hait
cea01c7212
item code get query in customer issue
2012-07-19 09:15:12 +05:30
Anand Doshi
5756630efb
Merge branch 'master' of github.com:webnotes/erpnext into dev
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
public/js/all-app.js
2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673
Changed file names from listview.js to doctype_name_list.js
2012-07-18 20:25:58 +05:30
Anand Doshi
6efc49af46
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-18 20:15:01 +05:30
Anand Doshi
f2f5c94c41
Default Currency specification for Customer and Supplier
...
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
2012-07-18 20:13:52 +05:30
Nabin Hait
28115f3373
repost stock due to incorrect packing list
2012-07-18 18:29:05 +05:30
Nabin Hait
2e72b6ae2c
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-18 18:13:04 +05:30
Nabin Hait
ddb9f948ee
repost stock due to incorrect packing list
2012-07-18 18:12:34 +05:30
Anand Doshi
a60266d780
fix in doclistview group by logic
2012-07-18 15:43:43 +05:30
Nabin Hait
18b9eccdfa
packing list issue fixed
2012-07-18 13:31:08 +05:30
Nabin Hait
41c922d200
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-18 13:19:32 +05:30
Nabin Hait
510eda353a
packing list issue fixed
2012-07-18 13:19:01 +05:30
Anand Doshi
04fd09c639
Merge branch 'master' of github.com:webnotes/erpnext into dev
2012-07-17 13:33:57 +05:30
Anand Doshi
4612e696b0
mark stock entry as is_submittable
2012-07-17 13:33:41 +05:30
Anand Doshi
3a281ae6c3
Merge branch 'master' of github.com:webnotes/erpnext into dev
...
Conflicts:
erpnext/patches/patch_list.py
2012-07-17 13:21:55 +05:30
Anand Doshi
26ca2c8c77
fix in syntax of owner match patch
2012-07-17 13:08:46 +05:30
Anand Doshi
5d4aaaa8a7
patch to remove match condition of owner on event doctype
2012-07-17 13:06:34 +05:30
Nabin Hait
8b091cd864
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 16:35:10 +05:30
Nabin Hait
a25ebe3dbf
Conversion rate fieldtype set as float (from currency)
2012-07-16 16:34:28 +05:30
Anand Doshi
2f192a6167
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 16:33:22 +05:30
Anand Doshi
8499773db8
fix in last sales and quote rate in quotation
2012-07-16 16:33:10 +05:30
Rushabh Mehta
4ae82ca0c2
users pages deprecated
2012-07-16 16:20:11 +05:30
Rushabh Mehta
527c5b6da5
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 15:45:18 +05:30
Rushabh Mehta
3c419c5e05
cur_frm.doc re-reference when is called
2012-07-16 15:44:38 +05:30
Nabin Hait
65535da220
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 15:38:41 +05:30
Nabin Hait
49e170153e
Include in print rate validation added
2012-07-16 15:38:11 +05:30
Anand Doshi
e7c54a4714
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 15:16:27 +05:30
Anand Doshi
7f2385cee9
Merge branch 'master' into dev
2012-07-16 15:15:34 +05:30
Anand Doshi
59fa430be3
fixes in quotation item code get query
2012-07-16 15:15:24 +05:30
Rushabh Mehta
9e9809a44f
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 14:17:22 +05:30
Rushabh Mehta
2eef40bf1e
get_field > wn.meta.get_docfield
2012-07-16 14:16:57 +05:30
Nabin Hait
8f5cd388cc
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 12:50:25 +05:30
Nabin Hait
388e09834c
Check duplicate SO entry for same po no and customer
2012-07-16 12:49:52 +05:30
Anand Doshi
bb81c198f5
Merge branch 'dev' of github.com:webnotes/erpnext into dev
...
Conflicts:
public/js/all-app.js
public/js/all-web.js
2012-07-13 16:48:08 +05:30
Anand Doshi
2fef0ee4e1
Merge branch 'master' into dev
2012-07-13 16:47:09 +05:30
Anand Doshi
9ec8024db7
show order type icon in sales order list view
2012-07-13 16:46:12 +05:30
Rushabh Mehta
2d7cb22f1f
added auth_table patch file:
2012-07-13 15:07:07 +05:30
Rushabh Mehta
91ba346354
profile cleanup start and new auth table for better security
2012-07-13 14:54:40 +05:30
Nabin Hait
981446c7cc
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-13 11:19:27 +05:30
Rushabh Mehta
d47efd57ac
check_required fix
2012-07-13 11:15:25 +05:30
Nabin Hait
0c9a262de4
fixed conflict
2012-07-13 10:39:45 +05:30
Nabin Hait
91223d325b
fixed conflict
2012-07-13 10:35:44 +05:30
Anand Doshi
158e7751a8
Merge branch 'master' into dev
2012-07-13 08:53:17 +05:30
Anand Doshi
255d58b3a0
fixes in error logging and refresh cache issues
2012-07-13 08:53:07 +05:30
Anand Doshi
31d8e5618e
Merge branch 'master' into dev
2012-07-13 08:24:28 +05:30
Anand Doshi
6c3b622c00
fixes in cms2 patch
2012-07-13 08:24:16 +05:30
Anand Doshi
1d2826d69d
Merge branch 'master' into dev
2012-07-13 08:15:34 +05:30
Anand Doshi
665f6048f1
do not delete web cache in refresh cache
2012-07-13 08:15:03 +05:30
Anand Doshi
72a824f483
do not delete web cache in refresh cache
2012-07-13 08:14:32 +05:30
Anand Doshi
91f731641c
Merge branch 'master' into dev
2012-07-13 02:16:54 +05:30
Anand Doshi
4cf55c5a04
fixes in blog caching
2012-07-13 02:16:22 +05:30
Anand Doshi
46ac229edc
Merge branch 'master' into dev
2012-07-13 01:45:33 +05:30
Anand Doshi
53bd49d46c
fixes in blog cache logic
2012-07-13 01:45:19 +05:30
Anand Doshi
d738a2106d
Merge branch 'master' into dev
2012-07-13 01:32:36 +05:30
Anand Doshi
51eb8a18ba
fix in blog caching
2012-07-13 01:32:23 +05:30
Anand Doshi
0842fad927
Merge branch 'master' into dev
2012-07-13 01:22:32 +05:30
Anand Doshi
970988664a
clear cache if home page
2012-07-13 01:22:19 +05:30
Anand Doshi
aa3ab5ec59
Merge branch 'master' into dev
2012-07-13 01:15:08 +05:30
Anand Doshi
200c443b72
fixes in blog list
2012-07-13 01:14:52 +05:30
Anand Doshi
8b8478178c
Merge branch 'master' into dev
2012-07-13 00:47:17 +05:30
Anand Doshi
f01059fd3e
fixes in blog list
2012-07-13 00:46:59 +05:30
Anand Doshi
4a56e996f1
Merge branch 'master' into dev
2012-07-12 23:38:45 +05:30
Anand Doshi
4659b1eb25
log error on saving doclist in cms2 patch
2012-07-12 23:38:31 +05:30
Anand Doshi
c97f780940
Merge branch 'master' into dev
...
Conflicts:
erpnext/patches/patch_list.py
erpnext/startup/js/complete_setup.js
erpnext/stock/doctype/item/item.txt
public/css/all-app.css
public/js/all-app.js
public/js/all-web.js
2012-07-12 22:16:19 +05:30
Anand Doshi
af1f437fad
update in cms2 patch: delete html files
2012-07-12 22:06:27 +05:30
Anand Doshi
3d53e86755
fixes in log comment and web page saving
2012-07-12 20:12:40 +05:30
Anand Doshi
c4eb9bf838
cms2 patch updates
2012-07-12 19:15:52 +05:30
Anand Doshi
1a51cc9ad0
fixes in cms2 updates
2012-07-12 19:03:58 +05:30
Anand Doshi
d68dceb791
Merge branch 'master' of github.com:webnotes/erpnext into cms2
2012-07-12 18:53:35 +05:30
Anand Doshi
51146c07c3
cleaner web cache code
2012-07-12 18:41:12 +05:30
Rushabh Mehta
8cbbab2e75
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-12 18:01:31 +05:30
Rushabh Mehta
357fb2640b
sales bom fixes and mandatory in table fields
2012-07-12 18:00:21 +05:30
Nabin Hait
51f8a6d0d5
select employee based on joining and relieving date in salary maanger
2012-07-12 16:25:13 +05:30
Rushabh Mehta
4feae61b62
fixes to taxes and charges master and naming_series
2012-07-12 16:01:20 +05:30
Nabin Hait
70db682a9a
fixed conflict in setup control
2012-07-12 11:47:40 +05:30
Rushabh Mehta
5faf37f312
item group cleanup
2012-07-12 11:33:00 +05:30
Nabin Hait
179f01af17
hong kong added in country list
2012-07-12 11:03:39 +05:30
Nabin Hait
e9c19369a9
salary slip will not submitted through salary manager if Send email checked and invalid email id
2012-07-12 10:33:45 +05:30
Rushabh Mehta
cf969143f2
cleaned up customer group
2012-07-12 09:54:43 +05:30
Anand Doshi
8790188fc8
fixes in web cache record insert for exceptional pages like 404, login-page, index etc.
2012-07-11 20:04:32 +05:30
Rushabh Mehta
b9fabf8e16
sales bom cleanup
2012-07-11 19:18:50 +05:30
Anand Doshi
be59e7cc10
fixes in web cache
2012-07-11 19:12:01 +05:30
Anand Doshi
f7765a899b
Show Brand as ERPNext if brand not specified
2012-07-11 19:05:27 +05:30
Anand Doshi
51fc20be5b
fixes in index page logic
2012-07-11 18:56:13 +05:30
Nabin Hait
4b8b19a281
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-11 18:41:20 +05:30
Anand Doshi
8c7e76ba44
RSS for blog
...
Comment addition into blog page's dom
2012-07-11 18:40:57 +05:30
Nabin Hait
548a45d550
Hong kong timezone added
2012-07-11 18:40:48 +05:30
Nabin Hait
0cd057ce94
Hong kong timezone added
2012-07-11 18:39:28 +05:30
Rushabh Mehta
cda9732f51
price list cleanup
2012-07-11 17:29:46 +05:30
Nabin Hait
42e1273c4c
listview for salary structure
2012-07-11 16:38:00 +05:30
Rushabh Mehta
3a0f191658
cleaned up fiscal_year, currency and added select-all + help in doclistview
2012-07-11 16:35:39 +05:30
Nabin Hait
3b0f5dddea
fiscal_year_closed and abbr removed from code
2012-07-11 15:14:06 +05:30
Rushabh Mehta
9acf463427
budget distribution cleanup and formatting of markdown
2012-07-11 14:39:33 +05:30
Anand Doshi
1522f5d76b
Merge branch 'master' of github.com:webnotes/erpnext into cms2
2012-07-11 14:27:22 +05:30
Rushabh Mehta
e3dd54c220
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-11 13:19:36 +05:30
Rushabh Mehta
e57267f79a
added patch for account and cleanups to breadcrumbs and msgprint
2012-07-11 13:18:58 +05:30
Nabin Hait
21fdff01e2
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-11 13:16:38 +05:30
Nabin Hait
9e5059f6b9
packing list introduced in pos invoice
2012-07-11 13:15:57 +05:30
Nabin Hait
cfc6bb1d6c
consider warehouse, serial no and batch no from packing list for sales bom item and populate packing list only for sales bom items
2012-07-11 13:14:52 +05:30
Anand Doshi
e2cddd4e78
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-11 12:09:41 +05:30
Anand Doshi
45ec64a58e
fixes in outgoing email connection error handling
2012-07-11 12:06:38 +05:30
Nabin Hait
e4e78b469a
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-11 11:54:08 +05:30
Rushabh Mehta
bf96499c0e
account cleanup, added toggle_fields in cur_frm
2012-07-11 09:51:18 +05:30
Rushabh Mehta
d6814dde29
account cleanup started
2012-07-10 18:38:59 +05:30
Nabin Hait
c296764cfe
repost button removed from closing entry voucher
2012-07-10 18:25:59 +05:30
Nabin Hait
dcc4cf1fe6
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-10 18:18:57 +05:30
Nabin Hait
04aa191869
freezed account allowed in closing entry
2012-07-10 18:18:03 +05:30
Rushabh Mehta
5281e350fb
cost center cleanup
2012-07-10 18:16:09 +05:30
Nabin Hait
29d7641206
fixed issue in period closing voucher: consider freezed account for closing
2012-07-10 18:12:00 +05:30
Rushabh Mehta
1ee2a5ac12
cost center cleanup + grid css
2012-07-10 17:22:20 +05:30
Anand Doshi
090a12d167
do not force send email using conf.py configuration
2012-07-10 15:15:46 +05:30
Nabin Hait
0aec0e1a63
repost balance button removed from period closing voucher
2012-07-10 14:24:45 +05:30
Nabin Hait
7c0b893b1f
mandatory validation in cost center
2012-07-10 14:18:35 +05:30
Nabin Hait
969622dcef
mandatory validation in cost center
2012-07-10 14:11:01 +05:30
Nabin Hait
0a38e4528b
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-10 10:28:21 +05:30
Nabin Hait
1b310c26ce
removed depricated commenting style
2012-07-10 10:27:58 +05:30
Anand Doshi
40fce89631
Favicon for website
...
Started work on comments to be embedded in blog page
2012-07-09 20:02:52 +05:30
Nabin Hait
94a6c7e8ac
changes in reset_series
2012-07-09 16:06:53 +05:30
Anand Doshi
e47def842d
Improvements in product page and its listing
...
Login page rendered via a template
2012-07-09 15:56:12 +05:30
Nabin Hait
cbd23dace7
Merge branch 'master' of git://github.com/webnotes/erpnext
2012-07-09 15:26:10 +05:30
Nabin Hait
1c9903594b
utility script for cleanup test data
2012-07-09 15:25:08 +05:30
Anand Doshi
0f5e220d6c
Email Digest: New Transactions --> consider feed_type is null records only
2012-07-09 12:48:32 +05:30
Anand Doshi
c6fce634cf
added app frame to todo list
2012-07-09 12:34:02 +05:30
Anand Doshi
95a822c701
Fetch Customer's Item Code in Sales Transaction
2012-07-09 11:09:07 +05:30
Nabin Hait
cb2e76a79c
delete row issue in grid fixed
2012-07-05 14:44:39 +05:30
Anand Doshi
8c90f12967
changed label of included in print rate to Is this Tax included in Basic Rate?
2012-07-04 13:30:13 +05:30
Anand Doshi
ac475c61dc
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-04 11:26:01 +05:30
Anand Doshi
1731786a61
Merge branch 'master' of github.com:webnotes/erpnext into cms2
2012-07-03 15:51:11 +05:30
Nabin Hait
b0e15d6ec5
Update master
2012-07-03 15:30:52 +05:30
Anand Doshi
af539fa5bd
deprecate import data control
2012-07-03 14:45:03 +05:30
Anand Doshi
1b8f24b507
update in contact's permissions
2012-07-03 12:55:17 +05:30
Nabin Hait
594d63ab5d
serial no fix
2012-07-03 12:24:18 +05:30
Nabin Hait
fdb1993125
fixed conflict
2012-07-03 12:14:48 +05:30
Anand Doshi
851b9c0aad
address contact permissions
2012-07-02 20:25:26 +05:30
Anand Doshi
d383e573fc
contact, address list views and allow their deletion from customer / supplier form
2012-07-02 19:45:35 +05:30
Nabin Hait
9b1e9aceaf
packing list cleanup and serial no status update
2012-07-02 16:42:46 +05:30
Nabin Hait
52fd9de425
packing list cleanup and serial no status update
2012-07-02 16:41:11 +05:30
Nabin Hait
de293e51fc
save packing list after cleanup
2012-07-02 16:24:54 +05:30
Anand Doshi
8c7cd2c407
Merge branch 'master' of github.com:webnotes/erpnext into dev
2012-07-02 14:44:05 +05:30
Anand Doshi
cec84e1ec7
logout a disabled user
2012-07-02 11:55:29 +05:30
Nabin Hait
6751261589
reload pr-po mapper patch'
2012-07-02 11:24:37 +05:30
Nabin Hait
5a376f0cdb
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-02 11:14:25 +05:30
Nabin Hait
84a2e546de
po date should be greated than equal to pur request date
2012-07-02 11:13:48 +05:30
Anand Doshi
c4cae8d561
Merge branch 'master' into dev
2012-06-29 19:07:29 +05:30
Anand Doshi
54b7235705
formatted money in chart of accounts tree
2012-06-29 19:07:20 +05:30
Anand Doshi
365e0c5f13
Merge branch 'master' into dev
2012-06-29 19:04:10 +05:30
Anand Doshi
351352670e
formatted money in chart of accounts tree
2012-06-29 19:03:59 +05:30
Anand Doshi
e9a21cbb85
show child table values in doclistview
2012-06-29 18:09:04 +05:30
Anand Doshi
ebe23b0f89
allow deletion of communication
2012-06-29 16:38:07 +05:30
Anand Doshi
1f69f92d2f
supplier part number in purchase order
2012-06-29 13:25:08 +05:30
Anand Doshi
efc055241a
Merge branch 'master' into dev
2012-06-29 12:25:02 +05:30
Anand Doshi
08faf5bb7f
added field descriptions for packing slip
2012-06-29 12:24:35 +05:30
Anand Doshi
bd025a6cdf
added field descriptions for packing slip
2012-06-29 12:23:44 +05:30
Anand Doshi
b38546489d
Merge branch 'master' into dev
2012-06-28 20:49:31 +05:30
Anand Doshi
bfd9258326
fix in cacheitem table
2012-06-28 20:46:46 +05:30
Anand Doshi
e301e8a6c1
Merge branch 'master' into dev
...
Conflicts:
erpnext/buying/doctype/quality_inspection/quality_inspection.py
2012-06-28 18:40:57 +05:30
Anand Doshi
cbf181c390
employee list -- show status
2012-06-28 18:38:38 +05:30
Anand Doshi
36f5e257ed
minor fix in support ticket list view
2012-06-28 13:08:43 +05:30
Anand Doshi
fef4a71177
minor fix in communication list view
2012-06-28 13:05:39 +05:30
Anand Doshi
0afab07a1f
communication listview - show pretty date
2012-06-28 12:59:33 +05:30
Nabin Hait
2c2a17f138
pull available qty in so and DN in selection of item
2012-06-27 15:14:58 +05:30
Nabin Hait
1bf92fe034
update modified time of GRN while updating QA no in GRN
2012-06-27 14:50:14 +05:30
Anand Doshi
d4425cc57d
Merge branch 'master' into dev
...
Conflicts:
erpnext/support/doctype/maintenance_visit/maintenance_visit.py
2012-06-27 14:13:34 +05:30
Nabin Hait
490ae41cee
maintenance visit cleanup and integrated with maintenance schedule
2012-06-27 13:21:12 +05:30
Anand Doshi
bba4db1627
product listing and pages
2012-06-27 12:06:45 +05:30
Nabin Hait
b81aa88091
Lease agreement link removed from account home page
2012-06-27 12:00:24 +05:30
Nabin Hait
7ce737be3d
Issue fixed in stock reconciliation
2012-06-27 11:33:05 +05:30
Nabin Hait
b8108c68e9
Issue fixed in stock reconciliation
2012-06-27 11:16:28 +05:30
Nabin Hait
5a24749456
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-27 10:12:21 +05:30
Anand Doshi
10bcf5ea25
blog listing + started with products page and listing
2012-06-26 18:54:10 +05:30
Anand Doshi
74962a9213
auto create email digest after setup is completed
2012-06-26 12:47:14 +05:30
Anand Doshi
401f12418f
Merge branch 'master' into dev
...
Conflicts:
erpnext/patches/patch_list.py
2012-06-26 12:20:29 +05:30
Anand Doshi
0b06004986
delete unwanted doctypes of website settings
2012-06-26 12:18:41 +05:30
Anand Doshi
68196bc966
delete records in child table where parent is missing or parent is like
...
old_par%
2012-06-26 12:15:21 +05:30
Anand Doshi
81fa802e09
Merge branch 'master' into dev
2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf
fixes related to --> clear locals and then sync locals when whole doclist is passed
2012-06-25 20:05:35 +05:30
Nabin Hait
a5e972dd89
reserved warehouse in so and delivery warehouse in dn can be different
2012-06-25 18:06:37 +05:30
Nabin Hait
c6fc345f35
alter tabsessions to change user column definition
2012-06-25 15:30:59 +05:30
Nabin Hait
e5a0086fea
alter tabsessions to change user column definition
2012-06-25 15:29:40 +05:30
Nabin Hait
8b14617dce
run view ledger report through set_route
2012-06-25 13:15:59 +05:30
Nabin Hait
72a6ec8cb3
SO search query in DN: currency check removed
2012-06-25 10:39:38 +05:30
Anand Doshi
c7b485e724
blog - on update - delete cache if not published
2012-06-22 20:08:30 +05:30
Anand Doshi
72c945b7c6
template based web page loading using web.py
2012-06-22 20:01:07 +05:30
Nabin Hait
33dcbc096a
error fixed in cost center wise expense report
2012-06-22 14:34:46 +05:30
Nabin Hait
bceec1cbef
error fixed in cost center wise expense report
2012-06-22 14:32:56 +05:30
Nabin Hait
1f5a58eed7
listview of sales invoice
2012-06-22 14:19:06 +05:30
Nabin Hait
486718250e
listview of purchase invoice and deletion of supplier
2012-06-22 14:14:04 +05:30
Nabin Hait
318eab813c
delete customer account on deletion of customer record
2012-06-22 13:35:13 +05:30
Anand Doshi
24aaa09c99
Merge branch 'master' into dev
2012-06-22 10:56:59 +05:30
Anand Doshi
b4aa0f8ce8
fix in price list: check if a row has content before checking its length; allow only 1 attachment
2012-06-22 10:56:12 +05:30
Anand Doshi
9078f652c3
Merge branch 'master' into cms2
2012-06-21 11:50:44 +05:30
Anand Doshi
5d9fc72753
updates in web.py and template - page.html
2012-06-21 11:48:51 +05:30
Anand Doshi
2939a0ea65
fetch price list rates when creating quotation from opportunity
2012-06-21 11:20:37 +05:30
Nabin Hait
0480153042
error fixed in sales register
2012-06-19 18:07:03 +05:30
Nabin Hait
11de3ec952
fixed error in purchase register
2012-06-19 18:03:31 +05:30
Rushabh Mehta
40182bada3
added patch
2012-06-19 14:15:13 +05:30
Anand Doshi
f8946b1e31
fix in buttons displayed - on change of status in lead form
2012-06-18 18:04:28 +05:30
Anand Doshi
422a27cde0
fix in web page saving issue
2012-06-18 17:37:04 +05:30
Nabin Hait
785fe9abc4
validation changed in supplier
2012-06-18 12:43:25 +05:30
Nabin Hait
34b4d26c1a
reload_doc replaced with sync in patch
2012-06-18 11:18:27 +05:30
Nabin Hait
28447e84c2
Update master
2012-06-18 11:03:51 +05:30
Nabin Hait
3adfa9595e
patch list updated
2012-06-17 21:57:37 +05:30
Nabin Hait
3ad3ebdaec
set recurring type as Monthly in all old sales invoice
2012-06-17 21:54:50 +05:30
Nabin Hait
8eadf09e99
recurring invoice : quarterly, half-yearly and yearly
2012-06-17 21:48:33 +05:30
Rushabh Mehta
96bf0b7f53
web pages don't render into Page and Page does not get written as HTML. Welcome Jinja2 Templates
2012-06-15 17:29:03 +05:30
Rushabh Mehta
cc53afcef3
Merge branch 'master' of github.com:webnotes/erpnext into cms2
2012-06-15 14:01:07 +05:30
Rushabh Mehta
bd7f7231f2
cms now powered by jinja2
2012-06-15 14:00:06 +05:30
Anand Doshi
3878b2a1ac
add unique constraint to tabSeries name column
2012-06-14 18:28:29 +05:30
Anand Doshi
7d1e8f218b
change date field for sales invoice in sales personwise transaction summary search criteria
2012-06-14 18:11:36 +05:30
Anand Doshi
616c355d20
fix in todos and email settings
2012-06-14 16:46:48 +05:30
Anand Doshi
a86d7887f0
fixes in support ticket autoreply
2012-06-14 14:59:04 +05:30
Anand Doshi
92fd9cce35
fixes in support ticket and email settings
2012-06-14 14:55:44 +05:30
Rushabh Mehta
4c56275d26
appframe is now heading
2012-06-14 11:05:09 +05:30
Anand Doshi
575545d441
added link to show list of all reports
2012-06-13 19:36:55 +05:30
Anand Doshi
94f26eae7c
patch for list of search criteria and reports
2012-06-13 19:04:27 +05:30
Anand Doshi
47afacc8e9
1. Reports List - allow read permission to All
...
2. Display message when ToDo doesnt contain any item
2012-06-13 18:02:43 +05:30
Anand Doshi
d104f4bc32
fix in todo
2012-06-13 17:01:52 +05:30
Anand Doshi
7deaff1979
fixed default tax fetch issue
2012-06-13 14:20:24 +05:30
Anand Doshi
3c3f996ade
todo list with assigned to others list
2012-06-13 12:01:41 +05:30
Anand Doshi
64ddb9f069
show assigned to others list in todo
2012-06-12 19:24:12 +05:30
Anand Doshi
4f4f58293f
fix in item group on_trash
2012-06-12 17:03:09 +05:30
Nabin Hait
4676891cbf
error fixed in reorder item email notification
2012-06-12 15:04:38 +05:30
Nabin Hait
d8fd8cfe1b
error fixed in reorder item email notification
2012-06-12 14:30:57 +05:30
Nabin Hait
ea8ff071cb
error fixed in reorder item email notification
2012-06-12 14:23:48 +05:30
Anand Doshi
eddea78768
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-12 14:18:14 +05:30
Anand Doshi
443426277b
sync purchase invoice item, purchase_receipt_item and purchase order item before patch
2012-06-12 14:17:44 +05:30
Nabin Hait
75af0b2867
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-12 14:16:45 +05:30
Anand Doshi
8eaa2dd570
sync purchase invoice item and purchase order item before patch
2012-06-12 14:16:37 +05:30
Nabin Hait
9b0178acae
error fixed in reorder item email notification
2012-06-12 14:16:21 +05:30
Anand Doshi
0146ddcfc6
delete communication log for supplier and customer, on trash
2012-06-12 14:09:44 +05:30
Anand Doshi
89e2b3bda4
minor fix in lead's listview
2012-06-12 13:11:29 +05:30
Anand Doshi
3b6eda3b45
fix in listviews of lead, customer and supplier
2012-06-12 13:08:57 +05:30
Nabin Hait
8afa88b906
fixed utf8 error in multi ledger export
2012-06-11 17:48:40 +05:30
Anand Doshi
a4b19f1d58
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-08 18:21:56 +05:30
Anand Doshi
a65ad2c901
fetch customer/supplier given a contact in communication
2012-06-08 18:21:35 +05:30
Nabin Hait
6581ef9449
fetch organization from lead to quote
2012-06-08 18:19:32 +05:30
Nabin Hait
f74b023106
fetch organization from lead to quote
2012-06-08 18:14:38 +05:30
Nabin Hait
7357fc1817
fetch organization from lead to quote
2012-06-08 18:02:38 +05:30
Nabin Hait
563eb9c43b
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-08 16:15:38 +05:30
Nabin Hait
be5e5059c3
Lead Organization field added in quotation
2012-06-08 16:15:08 +05:30
Anand Doshi
3ee7bb5ead
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-08 16:07:45 +05:30
Anand Doshi
08c0869a3b
load some conf data in boot
2012-06-08 16:07:01 +05:30
Rushabh Mehta
be7ce4744a
website color should be black
2012-06-08 14:18:21 +05:30
Nabin Hait
59c7670713
copy uom in pur inv from po, pr
2012-06-08 12:31:37 +05:30
Nabin Hait
d491fc7a31
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-08 12:13:47 +05:30
Nabin Hait
856442e33b
taxes query changes
2012-06-08 12:13:00 +05:30
Nabin Hait
2e3579a4eb
Item Barcode implemented
2012-06-07 19:09:17 +05:30
Anand Doshi
4dbeae1eae
escape double quotes in communication content, allow 0 as value in data/int field
2012-06-07 14:39:42 +05:30
Nabin Hait
91034af0dc
Get Query changes for tax account: allowed account type income/expense
2012-06-07 12:12:08 +05:30
Rushabh Mehta
9d18ebbf69
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-07 11:58:16 +05:30
Rushabh Mehta
e810f8eadc
web-page name fix
2012-06-07 11:57:32 +05:30
Anand Doshi
afb3d53f55
fix in gs
2012-06-07 11:50:52 +05:30
Anand Doshi
e5de85aec2
fix in communication list in parent forms
2012-06-07 11:41:42 +05:30
Rushabh Mehta
a89f52041f
communication is now created when email is sent
2012-06-07 11:30:02 +05:30
Rushabh Mehta
e97f8bbb5a
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-07 11:00:49 +05:30
Rushabh Mehta
0873e75fb2
better notification message
2012-06-07 11:00:33 +05:30
Anand Doshi
08c4f64d5f
fix in communication listing
2012-06-06 13:19:38 +05:30
Anand Doshi
e37bf2215a
do not load communication if no permission
2012-06-06 12:41:34 +05:30
Rushabh Mehta
c91e16dd1e
email_digest updates
2012-06-06 11:27:38 +05:30
Rushabh Mehta
0b00b46a99
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-06 11:11:58 +05:30
Rushabh Mehta
260162db1b
email digest: mobile friendly
2012-06-06 11:11:35 +05:30
Anand Doshi
937d838bdc
min height for communication history and transaction history
2012-06-05 20:19:52 +05:30
Anand Doshi
49230000e5
communication log removal patch
2012-06-05 18:51:57 +05:30
Anand Doshi
dbb84a271e
Merge branch 'master' of github.com:webnotes/erpnext into comm_log
...
Conflicts:
erpnext/selling/doctype/lead/lead.js
erpnext/setup/doctype/contact_control/contact_control.js
2012-06-05 18:37:17 +05:30
Anand Doshi
390b788e7b
communication
2012-06-05 18:28:38 +05:30
Nabin Hait
252a7a189b
Account type=Income/Expense allowed in income/expense account searching in sales/pur invoice
2012-06-05 15:27:12 +05:30
Nabin Hait
f24d2efe2c
Parent node validation fixed for tree
2012-06-05 10:41:27 +05:30
Nabin Hait
c84c86e458
customer info added in maintenance schedule event
2012-06-04 17:47:47 +05:30
Nabin Hait
6c34e1411f
Flexible invoice period in recurring invoice
2012-06-04 16:21:25 +05:30
Nabin Hait
bc8e9d7a34
Flexible invoice period in recurring invoice
2012-06-04 16:18:38 +05:30
Nabin Hait
9ec73ccf1e
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-04 14:04:57 +05:30
Nabin Hait
6ea87a42a8
convert to group/ledger button hide/unhide issue fixed
2012-06-04 14:04:36 +05:30
Rushabh Mehta
983c551796
gantt chart fixes
2012-06-04 13:20:42 +05:30
Rushabh Mehta
07c94ce9c0
update in Task, notification and layout
2012-06-04 12:57:23 +05:30
Nabin Hait
aaab084a12
uom field added in pur invoice item table
2012-06-04 12:10:43 +05:30
Nabin Hait
d2301f9569
uom field added in pur invoice item table
2012-06-04 12:07:45 +05:30
Nabin Hait
765298bc63
uom field added in pur invoice item table
2012-06-04 12:02:56 +05:30
Nabin Hait
e4f2c7b213
series issue in attendance template
2012-06-04 11:48:50 +05:30
Nabin Hait
e91d8ccc5c
Custom query for item in serial no
2012-06-04 10:47:44 +05:30
Nabin Hait
0e4afb910b
parent node get_query modified in all tree
2012-06-04 10:32:31 +05:30
Nabin Hait
e315aba130
expected delivery date mandatory only if order type is sales
2012-06-01 10:11:14 +05:30
Anand Doshi
c5d857896e
fixes in communication doctype
2012-05-31 18:23:16 +05:30
Nabin Hait
e44ebb1ec7
removed available qty validation in pos
2012-05-31 15:22:05 +05:30
Anand Doshi
a6708fb748
new doctype: communication
2012-05-31 14:53:55 +05:30
Nabin Hait
fe678fd638
balance area only for accounts not for cost center
2012-05-31 13:32:45 +05:30
Nabin Hait
1835ee6c8b
issue fixed
2012-05-31 12:28:07 +05:30
Nabin Hait
0908b2709b
fixed conflict
2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639
fixed conflict
2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6
Link to Sales/accounts browser fixed
2012-05-31 11:43:14 +05:30
Anand Doshi
6971f577da
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-29 15:47:47 +05:30
Anand Doshi
9c011f405d
new rename doc function
2012-05-29 15:47:27 +05:30
Anand Doshi
82695ddd90
fixes in transaction history of customer and supplier
2012-05-29 14:14:27 +05:30
Anand Doshi
2ac77beb50
fix in packing list issue
2012-05-29 11:29:52 +05:30
Anand Doshi
53bac88d92
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-29 11:00:06 +05:30
Anand Doshi
2afe974a5b
fix in remove euro currency patch
2012-05-29 10:58:28 +05:30
Rushabh Mehta
92c2c8f1f6
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-29 10:53:58 +05:30
Rushabh Mehta
16aea34a37
show new reports as well as old
2012-05-29 10:53:37 +05:30
Anand Doshi
e012f06452
fix in purchase order validate currency's error messages, production order's produced qty field marked as no copy
2012-05-28 19:05:52 +05:30
Anand Doshi
3b091418ec
allow zero payment in POS Invoice, when cash/bank account is not specified
2012-05-28 18:08:02 +05:30
Anand Doshi
2ad2426610
fix in get other charges of sales_common.py
2012-05-28 16:05:54 +05:30
Anand Doshi
4792f51e2a
remove euro currency patch, address / contact supplier/customer can now contain slashes in their name
2012-05-28 13:26:17 +05:30
Anand Doshi
041cea763e
fix in stock ledger entry for items have sales bom
2012-05-25 17:49:37 +05:30
Anand Doshi
16cf4fa806
fix in get_item_list, which was causing negative stock error
2012-05-25 16:54:27 +05:30
Anand Doshi
002191f166
fix in rename tool
2012-05-25 12:20:27 +05:30
Anand Doshi
fc243ea7d4
removed debug from maintenace scheduler
2012-05-24 15:56:34 +05:30
Anand Doshi
5fda36f2c0
fix in profile permissions and support ticket response should update modified datetime
2012-05-24 12:39:18 +05:30
Anand Doshi
fcbd2ad792
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-23 18:27:29 +05:30
Anand Doshi
9da0bf6106
fix in customer address contact report
2012-05-23 18:27:05 +05:30
Nabin Hait
4aaaa8af7b
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-23 16:22:41 +05:30
Nabin Hait
2b06b903a5
Merge branch 'shf_rename'
2012-05-23 16:22:24 +05:30
Nabin Hait
517eacf9e3
packing list code updated for duplicate items in item table
2012-05-23 16:21:39 +05:30
Anand Doshi
9327bb9585
fix in tag viewing in doclistview
2012-05-23 15:12:22 +05:30
Nabin Hait
ea538bb9c7
fixed conflict
2012-05-23 12:57:05 +05:30
Nabin Hait
97bb6ce88b
create report manager role patch
2012-05-23 12:55:11 +05:30
Nabin Hait
86df78aabc
fixed conflict
2012-05-23 11:33:28 +05:30
Nabin Hait
53dab4ac40
validation in customer
2012-05-23 11:29:13 +05:30
Anand Doshi
38830ddae1
removed console log in customer.js
2012-05-23 10:55:59 +05:30
Nabin Hait
611157447f
sms fix
2012-05-22 17:25:39 +05:30
Anand Doshi
6033d96a56
fixes in style settings
2012-05-22 17:21:24 +05:30
Anand Doshi
e780f661a7
fix in transaction history
2012-05-22 17:04:33 +05:30
Nabin Hait
df9f8a363e
Balance on chart of accounts
2012-05-22 16:54:46 +05:30
Nabin Hait
78b62cd865
Maintain same rate throughout pur cycle: in global defaults, by default set true
2012-05-22 16:23:27 +05:30
Nabin Hait
a21d2a9b38
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-22 14:54:25 +05:30
Nabin Hait
b695f73293
Maintain same rate throughout pur cycle: in global defaults, by default set true
2012-05-22 14:53:40 +05:30
Anand Doshi
f0babb7f0f
fixes in cms
2012-05-22 13:41:51 +05:30
Anand Doshi
d287962cd9
removed the double check box in support ticket list
2012-05-21 19:36:47 +05:30
Rushabh Mehta
ceb2ab35e6
fixes in cms page generation
2012-05-21 15:56:50 +02:00
Anand Doshi
cb909d518c
Merge branch 'shf_rename'
2012-05-21 18:44:19 +05:30
Anand Doshi
dedd8cc510
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-21 18:41:57 +05:30
Anand Doshi
2c4cd08844
more listviews
2012-05-21 18:40:53 +05:30
Nabin Hait
86375f089a
Merge branch 'shf_rename'
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-21 15:48:21 +05:30
Nabin Hait
cba9c716f2
Remove all those parent items from packing details which are no longer present in main item table
2012-05-21 15:35:23 +05:30
Nabin Hait
ee2201cc68
forced export limit increased to 2000
2012-05-21 15:13:57 +05:30
Anand Doshi
6420e602e0
make server side custom script readonly for system manager
2012-05-21 15:11:36 +05:30
Anand Doshi
8db7ff3b36
hide domain list field, as it is not functional currently
2012-05-21 14:59:45 +05:30
Nabin Hait
d429a20c6e
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-21 14:51:04 +05:30
Nabin Hait
8b426a6142
customer issue cleanup
2012-05-21 14:50:28 +05:30
Nabin Hait
fec3f783af
custom field included in docfield query
2012-05-21 14:40:25 +05:30
Anand Doshi
1aae261490
delete button in doclistview
2012-05-21 14:31:03 +05:30
Nabin Hait
d9742a6a58
on_trash modified for item group, territory, customer group, and sales person
2012-05-21 13:33:09 +05:30
Anand Doshi
881f154275
change session cache storage as json
2012-05-21 13:13:10 +05:30
Rushabh Mehta
03a26f2ed2
list blogs based on creation date
2012-05-19 10:53:15 +05:30
Nabin Hait
c68635d70a
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-18 18:37:28 +05:30
Nabin Hait
3b8d4776a2
company validation
2012-05-18 18:36:56 +05:30
Anand Doshi
df914991c4
Merge branch 'shf_rename'
2012-05-18 18:21:43 +05:30
Anand Doshi
bde13a655f
moved uom next to qty in quotation item
2012-05-18 18:21:29 +05:30
Anand Doshi
fd3b19defa
Merge branch 'shf_rename'
2012-05-18 18:08:44 +05:30
Anand Doshi
67a2e0123c
moved po number and po date to basic info section of delivery note
2012-05-18 18:08:28 +05:30
Anand Doshi
0f7dd5453d
Merge branch 'shf_rename'
2012-05-18 16:55:48 +05:30
Anand Doshi
227e9d3ac6
cleanup customize form
2012-05-18 16:55:20 +05:30
Anand Doshi
00175612ac
Merge branch 'shf_rename'
...
Conflicts:
erpnext/stock/doctype/item/listview.js
2012-05-18 16:50:35 +05:30
Anand Doshi
d49da9bff1
new listviews
2012-05-18 16:49:36 +05:30
Anand Doshi
d643d367ca
Merge branch 'shf_rename'
...
Conflicts:
public/js/all-app.js
public/js/all-web.js
2012-05-18 11:52:31 +05:30
Anand Doshi
acd291a228
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-18 11:50:08 +05:30
Nabin Hait
c1f1702e22
so pending item patch
2012-05-18 11:43:10 +05:30
Nabin Hait
c58fbffc00
so pending item patch
2012-05-18 11:07:04 +05:30
Nabin Hait
a926468574
reload so pending items
2012-05-17 18:12:32 +05:30
Anand Doshi
fc9145425d
Fixes in Print Formats - discount in description
2012-05-17 18:11:54 +05:30
Nabin Hait
7a13b238cb
fixes in sales order pending items report
2012-05-17 18:06:14 +05:30
Nabin Hait
7638833b75
salary register issue fixed
2012-05-17 17:47:26 +05:30
Nabin Hait
f5e9dd7b96
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-17 17:10:59 +05:30
Nabin Hait
76d69b1000
salary register issue fixed
2012-05-17 17:10:15 +05:30
Anand Doshi
c7e26873c0
Merge branch 'shf_rename'
2012-05-17 15:28:54 +05:30
Anand Doshi
dad93ce8a3
fix in payment reconciliation
2012-05-17 15:28:38 +05:30
Nabin Hait
57f9bd1d73
bom issue fixed
2012-05-17 15:02:02 +05:30
Nabin Hait
86289d1291
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-17 12:48:19 +05:30
Nabin Hait
8b2473cc40
report fixed: sales persons target variance (item group wise)
2012-05-17 12:47:48 +05:30
Anand Doshi
ae4fc41e61
Merge branch 'shf_rename'
2012-05-16 14:35:15 +05:30
Anand Doshi
57599ebbae
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-16 14:11:24 +05:30
Anand Doshi
9175100e3d
fixes in print format
2012-05-16 14:10:27 +05:30
Nabin Hait
76862b1ebc
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-16 14:07:11 +05:30
Nabin Hait
7b87a7ec74
fixed pos settings
2012-05-16 14:07:02 +05:30
Anand Doshi
28335b7ee7
print format readonly patch
2012-05-16 13:44:06 +05:30
Anand Doshi
c51c0d38d7
Merge branch 'shf_rename'
2012-05-16 12:28:14 +05:30
Nabin Hait
f0c3fc47f9
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-16 12:20:53 +05:30
Nabin Hait
86dec8da7a
naming series issue fixed in pos settings
2012-05-16 12:20:21 +05:30
Anand Doshi
1bba28a723
Merge branch 'shf_rename'
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-15 18:22:55 +05:30
Anand Doshi
a5a747fd8d
reload sales invoice print formats
2012-05-15 18:17:52 +05:30
Nabin Hait
f044526b92
json error fixed in stock entry
2012-05-15 15:29:47 +05:30
Nabin Hait
901e92d8fa
rejected qty issue fixed
2012-05-15 13:40:26 +05:30
Nabin Hait
0a1c5d9db6
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-15 12:15:44 +05:30
Nabin Hait
ed02a85184
fixed issue
2012-05-15 12:15:19 +05:30
Anand Doshi
f295591168
Merge branch 'shf_rename'
2012-05-14 18:03:45 +05:30
Anand Doshi
4ce0cd7274
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-14 18:03:12 +05:30
Anand Doshi
4924c96380
sync support emails only when sync_support_mails is set to 1
2012-05-14 18:02:21 +05:30
Rushabh Mehta
deeae62b18
merge js/css
2012-05-14 15:03:17 +05:30
Rushabh Mehta
6598b6276b
fixes to website settings and linking import data in setup
2012-05-14 15:02:35 +05:30
Nabin Hait
a13b435163
invoice period in print format if recurring invoice
2012-05-14 14:11:56 +05:30
Anand Doshi
07af8f6247
fix in last purchase rate
2012-05-14 13:02:31 +05:30
Anand Doshi
4a3d3d75de
Merge branch 'shf_rename'
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-14 12:53:29 +05:30
Anand Doshi
314c202340
more changes to last purchase rate
2012-05-11 18:38:11 +05:30
Anand Doshi
cec150b487
fixes in last purchase rate
2012-05-11 18:13:53 +05:30
Rushabh Mehta
7483ae9573
fix in button disablity leading to double click
2012-05-11 16:23:41 +05:30
Rushabh Mehta
0eb790a0ae
cleaned up imports, doc
2012-05-11 15:53:37 +05:30
Nabin Hait
956eeb1361
fetch defaults after mapping from prev document
2012-05-11 14:45:02 +05:30
Nabin Hait
bd3d3ca1eb
error fixed in sending mail on submitting of sal slip
2012-05-11 13:36:17 +05:30
Nabin Hait
43dd041ced
page role series pacth
2012-05-11 11:47:18 +05:30
Nabin Hait
a5b8ac4867
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-11 11:12:23 +05:30
Nabin Hait
41526227e3
page role series pacth
2012-05-11 11:11:46 +05:30
Anand Doshi
df74d30cf1
fix in listview of journal voucher
2012-05-10 19:19:31 +05:30
Rushabh Mehta
7f523ac33c
merge
2012-05-10 19:11:00 +05:30
Rushabh Mehta
ea7ba72397
data import and upload issues
2012-05-10 19:07:53 +05:30
Anand Doshi
2f53eba3dc
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-10 18:48:47 +05:30
Anand Doshi
02c0eaf99a
don't show currency in journal voucher's listview
2012-05-10 18:48:15 +05:30
Nabin Hait
ef85c4e556
posting time fixes in stock ledger entry
2012-05-10 17:48:34 +05:30
Anand Doshi
4b1a44f4a7
fix blog page
2012-05-10 15:44:36 +05:30
Anand Doshi
3fa25faca2
fixes after merge with cms
2012-05-10 15:15:43 +05:30
Nabin Hait
91d6d1423d
reload reports
2012-05-10 14:32:56 +05:30
Nabin Hait
3f7b883010
reload reports
2012-05-10 14:32:02 +05:30
Anand Doshi
e463fc6300
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-10 14:20:09 +05:30
Anand Doshi
951d8ec342
fix in issues arising due to wn.require
2012-05-10 14:19:11 +05:30
Nabin Hait
6fb498ebcd
changed field position of net total(import)
2012-05-10 14:03:39 +05:30
Nabin Hait
a15740a974
fixed issue
2012-05-10 12:56:40 +05:30
Anand Doshi
bf68e04d2f
Merge branch 'master' of github.com:webnotes/erpnext
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-10 12:40:58 +05:30
Nabin Hait
fdeb55ba69
stock reco patch
2012-05-10 12:18:11 +05:30
Nabin Hait
08f4cb7f6a
stock reco fix in valuation and cancellation
2012-05-10 12:13:47 +05:30
Anand Doshi
df8b4ab9b1
Merge branch 'cms'
2012-05-10 10:21:29 +05:30
Rushabh Mehta
078867c411
fixes to listview
2012-05-09 16:15:51 +05:30
Rushabh Mehta
81dba76699
cms updates
2012-05-09 15:37:54 +05:30
Nabin Hait
7f82256394
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-09 15:27:03 +05:30
Nabin Hait
68f9ad31ae
serialized inventory fixes : serial no for sales bom child item and rejected qty
2012-05-09 15:26:27 +05:30
Rushabh Mehta
be93aa027f
cms fixes
2012-05-09 14:44:40 +05:30
Rushabh Mehta
fa390039ff
cms fixes
2012-05-09 14:41:36 +05:30
Rushabh Mehta
caf4e374ab
cms fixes
2012-05-09 14:40:44 +05:30
Rushabh Mehta
9454ccc5b8
cms fixes
2012-05-09 14:35:00 +05:30
Rushabh Mehta
cb1f1d81aa
cms patch
2012-05-09 14:10:49 +05:30
Rushabh Mehta
e45042e011
merge
2012-05-09 12:22:50 +05:30
Rushabh Mehta
b9483d1809
cms updates
2012-05-09 11:42:52 +05:30
Anand Doshi
c241a476ab
moved shipping address in basic info section
2012-05-09 11:07:15 +05:30
Rushabh Mehta
458ca8eddb
cms fixes
2012-05-09 10:17:08 +05:30
Nabin Hait
a6b8e84f09
removed whong depends on value
2012-05-08 17:18:40 +05:30
Rushabh Mehta
a933b632ad
templates cleaner and generation for all pages
2012-05-08 16:06:44 +05:30
Rushabh Mehta
5ab8163140
fixes to routing and activating web page
2012-05-08 12:58:32 +05:30
Nabin Hait
6d6ca4bdb8
mapper fix
2012-05-08 11:51:35 +05:30
Rushabh Mehta
c22d9e03e7
Merge branch 'shf_rename' of github.com:webnotes/erpnext into cms
2012-05-08 11:02:58 +05:30
Rushabh Mehta
a920943e43
new cms with public folder
2012-05-07 18:00:57 +05:30
Nabin Hait
c22bd05bb5
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-07 17:35:45 +05:30
Nabin Hait
5375627bca
stock reco issue fixed
2012-05-07 17:35:15 +05:30
Anand Doshi
a00852ce19
fix in purchase receipt - show challan no for indian customers
2012-05-07 16:59:28 +05:30
Nabin Hait
12ec1db2fa
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-07 12:00:00 +05:30
Nabin Hait
5f4ca56fd1
Fixes related to renamedt
2012-05-07 11:59:23 +05:30
Rushabh Mehta
7ef15ce7fe
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-07 10:44:24 +05:30
Rushabh Mehta
252664e288
remove unsupported for google
2012-05-07 10:43:18 +05:30
Anand Doshi
ebc3b87f8d
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-05 20:06:43 +05:30
Anand Doshi
f36aee2c6b
fix in contact address saving issue
2012-05-05 20:05:58 +05:30
Nabin Hait
875ccac151
stock reco cancellation issue fxed
2012-05-04 18:48:30 +05:30
Nabin Hait
b5d50dcc53
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-04 17:56:00 +05:30
Nabin Hait
ce4d297641
rename dt in custom search criteria
2012-05-04 17:55:32 +05:30
Anand Doshi
29d36a6cea
fixes in account setup
2012-05-04 16:20:30 +05:30
Anand Doshi
bc1d74dbfe
fix in landed cost master query
2012-05-04 13:13:44 +05:30
Anand Doshi
837baee1b4
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-04 13:05:36 +05:30
Anand Doshi
cc1583de88
fix in landed cost master
2012-05-04 13:04:40 +05:30
Nabin Hait
8cf9934b93
Trend analyzer issue fixed
2012-05-04 12:52:56 +05:30
Nabin Hait
978a1e0e46
field rearranged in sales invoice
2012-05-04 11:57:55 +05:30
Nabin Hait
ff81c37689
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-04 11:46:38 +05:30
Nabin Hait
0fb4eeb5bb
cancellation issue fixed in stock reco
2012-05-04 11:46:07 +05:30
Rushabh Mehta
f9c766ad3a
login-topbar id fix
2012-05-04 11:41:57 +05:30
Rushabh Mehta
7f5791ba1e
jv, search fix
2012-05-04 10:10:30 +05:30
Rushabh Mehta
22cd09beb3
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-04 10:02:51 +05:30
Rushabh Mehta
5a774db021
delivery, not and sales_bom
2012-05-04 10:02:09 +05:30
Nabin Hait
7c60fc13b2
reports fixed: itemwise sales/delivery report
2012-05-03 18:22:32 +05:30
Nabin Hait
a67f706c92
options did not updated in stock entry
2012-05-03 18:09:15 +05:30
Nabin Hait
0f11df13bb
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-03 17:50:06 +05:30
Nabin Hait
d8df7b5884
quotation fix
2012-05-03 17:49:45 +05:30
Anand Doshi
f09bd67e53
fix in security settings
2012-05-03 16:44:54 +05:30
Anand Doshi
ee9863cfce
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-03 16:27:20 +05:30
Anand Doshi
4b6c1f8de5
fixes in notification control due to renaming of doctype
2012-05-03 16:26:38 +05:30
Nabin Hait
d315cb5eb7
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-03 14:55:36 +05:30
Nabin Hait
dc7ffe47b2
fixes in quotation
2012-05-03 14:55:21 +05:30
Nabin Hait
16b6386648
fixes in quotation
2012-05-03 14:41:35 +05:30
Anand Doshi
47fac1804b
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-03 13:23:32 +05:30
Anand Doshi
359852e3d9
fix in email digest
2012-05-03 13:23:06 +05:30
Nabin Hait
618331672d
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-03 13:10:52 +05:30
Nabin Hait
32826a8cf1
fixes in customerwise price list
2012-05-03 13:10:34 +05:30
Anand Doshi
57bc3f424f
fix in email digest
2012-05-03 12:57:56 +05:30
Anand Doshi
996abdd155
fix in email digest
2012-05-03 12:48:44 +05:30
Anand Doshi
a467eee917
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-03 12:38:01 +05:30
Anand Doshi
e5982c0399
email digest fixes
2012-05-03 12:37:26 +05:30
Rushabh Mehta
ce02a74dbc
login id for topbar
2012-05-03 10:57:03 +05:30
Rushabh Mehta
39489278ec
update messages fix
2012-05-03 10:44:44 +05:30
Rushabh Mehta
28bb342f96
list view for purchase receipt
2012-05-03 10:41:19 +05:30
Rushabh Mehta
3d0c9ba22d
added listview for stock entry, listview templates
2012-05-03 10:35:51 +05:30
Rushabh Mehta
182569feb0
shipping address on top for delivery note
2012-05-03 10:28:23 +05:30
Rushabh Mehta
acd0769098
list in listview and sales order fix
2012-05-03 10:20:38 +05:30
Nabin Hait
8c04a1fe77
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 17:59:20 +05:30
Nabin Hait
b92d9ef618
removed patch file specific to bullows
2012-05-02 17:58:13 +05:30
Rushabh Mehta
d5e1031f42
floating logo on left
2012-05-02 17:44:59 +05:30
Nabin Hait
52ca9a1ed1
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 16:05:15 +05:30
Nabin Hait
00ba2ce8b4
fixes in sales and pur return
2012-05-02 16:04:42 +05:30
Rushabh Mehta
f2c3db6e83
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 15:30:58 +05:30
Rushabh Mehta
4ee56c064e
added ace editor
2012-05-02 15:30:15 +05:30
Nabin Hait
a4561e14aa
patch list updated
2012-05-02 14:58:53 +05:30
Nabin Hait
7ef8168dbc
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 14:56:17 +05:30
Nabin Hait
afb704c940
rename fix in prev doctype
2012-05-02 14:56:00 +05:30
Rushabh Mehta
30ab0227b3
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 13:45:25 +05:30
Rushabh Mehta
aa51377e94
custom startup
2012-05-02 13:03:41 +05:30
Anand Doshi
187ac7ccf1
delete question-view page
2012-05-02 12:23:44 +05:30
Anand Doshi
60118662ff
delete question-view page
2012-05-02 12:23:05 +05:30
Anand Doshi
b1f46c80b2
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 12:21:53 +05:30
Anand Doshi
e876ac2005
delete question-view page
2012-05-02 12:21:27 +05:30
Nabin Hait
a4e9a52ea3
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 12:19:59 +05:30
Nabin Hait
ab96d12086
fixes in customerwise price list
2012-05-02 12:19:33 +05:30
Rushabh Mehta
7b4a60a980
form toolbar lables and support ticket fix
2012-05-02 11:35:04 +05:30
Nabin Hait
c55d83b36e
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 10:36:29 +05:30
Nabin Hait
dd200d363e
cleanup property setter patch
2012-05-02 10:36:16 +05:30
Nabin Hait
50a0cadb9f
cleanup property setter patch
2012-05-02 10:32:28 +05:30
Rushabh Mehta
b21307767d
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 10:22:20 +05:30
Rushabh Mehta
a0571fe570
toolbar fix for null
2012-05-02 10:20:40 +05:30
Nabin Hait
8d6917dc04
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-02 10:00:44 +05:30
Nabin Hait
07c3b399f6
field arrngement fix
2012-05-02 10:00:03 +05:30
Rushabh Mehta
8eba118379
font fix
2012-05-02 09:45:28 +05:30
Anand Doshi
98ae634c50
fixes in sales order item widths
2012-05-01 18:31:40 +05:30
Nabin Hait
722bbd8ef0
JV fix
2012-05-01 16:36:51 +05:30
Nabin Hait
5af62d0857
fixed conflict using theirs
2012-05-01 16:29:40 +05:30
Nabin Hait
796505a83e
field arrangement in purchase and stock cycle
2012-05-01 16:26:16 +05:30
Rushabh Mehta
8360a5f729
no address in footer
2012-05-01 16:23:05 +05:30
Rushabh Mehta
c59fc6623b
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-01 16:15:37 +05:30
Rushabh Mehta
39c47a0b4b
blog sequence
2012-05-01 16:15:09 +05:30
Anand Doshi
23e777545a
fix in naming series patch's execution
2012-05-01 16:05:23 +05:30
Rushabh Mehta
58bf2379a0
double dashbaord
2012-05-01 15:18:26 +05:30
Rushabh Mehta
ef048f7256
fix to profile_settings
2012-05-01 14:56:20 +05:30
Rushabh Mehta
30e3f157bc
fix to startupjs
2012-05-01 14:07:41 +05:30
Rushabh Mehta
efed5239f0
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-01 13:43:03 +05:30
Rushabh Mehta
6f8e9e951e
website fixes
2012-05-01 13:41:44 +05:30
Nabin Hait
57d7c815d2
field arrangement in sales cycle
2012-05-01 12:35:12 +05:30
Anand Doshi
3f6eed2dc2
fix in account subscription info box creation
2012-05-01 12:23:28 +05:30
Nabin Hait
926f46f04a
Fixed conflict while merging with master
2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-01 11:37:45 +05:30
Nabin Hait
2ade43a647
field arrangement in sales cycle
2012-05-01 11:37:13 +05:30
Nabin Hait
1e335f3272
fixes in validattion of debit to account with customer in sales invoice
2012-05-01 10:53:50 +05:30
Nabin Hait
41c62727c7
fixes in validattion of debit to account with customer in sales invoice
2012-05-01 10:45:47 +05:30
Anand Doshi
563fcc1b05
fix in startup.js
2012-04-30 21:06:31 +05:30
Anand Doshi
5c2a792d03
if max_users = 0, consider unlimited users
2012-04-30 20:03:23 +05:30
Anand Doshi
954567b87f
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-30 20:01:00 +05:30
Anand Doshi
4b2b159d12
if max_users = 0, consider unlimited users
2012-04-30 20:00:19 +05:30
Rushabh Mehta
45850fe496
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-30 18:38:40 +05:30
Anand Doshi
84777ac457
change in expiry message
2012-04-30 18:33:32 +05:30
Rushabh Mehta
2ab4451d1b
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-30 18:05:47 +05:30
Nabin Hait
228d03ec01
posting time fix
2012-04-30 16:59:39 +05:30
Rushabh Mehta
79a664b4dc
cleaned up lead, opportunity, jv
2012-04-30 16:12:03 +05:30
Anand Doshi
72308564be
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-30 15:44:02 +05:30
Anand Doshi
2aa9ba63e3
fixes in select field type
2012-04-30 15:43:34 +05:30
Nabin Hait
41cc32790f
Fixed issie in auto notification
2012-04-30 14:36:18 +05:30
Rushabh Mehta
542acf6757
website, product and grid bugfix
2012-04-30 14:23:12 +05:30
Rushabh Mehta
963c651f2c
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-30 14:22:50 +05:30
Rushabh Mehta
a4be4d3390
website, product and grid bugfix
2012-04-30 14:22:02 +05:30
Anand Doshi
b60807c325
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-30 12:23:03 +05:30
Anand Doshi
c55d9ad033
working on setup account
2012-04-30 12:22:47 +05:30
Anand Doshi
8cffe7e440
fix in support ticket, expiry banner
2012-04-30 12:13:51 +05:30
Nabin Hait
28b9551acf
fixes in patch
2012-04-30 11:55:25 +05:30
Nabin Hait
d1ac71c3e7
patch list updated
2012-04-30 11:53:58 +05:30
Nabin Hait
d4c5a9e2c4
fixes in bin
2012-04-30 11:50:34 +05:30
Nabin Hait
3e8f35c09e
fixes in bin
2012-04-30 11:47:45 +05:30
Nabin Hait
fc51f995c8
fixes in bin
2012-04-30 11:43:16 +05:30
Rushabh Mehta
30cb5c20a1
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-27 18:39:56 +05:30
Rushabh Mehta
389880d0b6
more website cleanups
2012-04-27 18:39:14 +05:30
Nabin Hait
7ff69e10bf
repost stock for entries where posting time goes wrong
2012-04-27 18:27:06 +05:30
Nabin Hait
ebbd328977
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-27 18:15:13 +05:30
Anand Doshi
f5216b46e3
fixes
2012-04-27 18:03:47 +05:30
Nabin Hait
914d67a1a3
selective deletes from child table while overwriting
2012-04-27 17:47:46 +05:30
Anand Doshi
864e220ec5
fixes in serial no patch
2012-04-27 17:12:47 +05:30
Anand Doshi
d461148296
fix in reload_c_form path
2012-04-27 17:05:50 +05:30
Anand Doshi
3fbf2ec0c5
fix in setup control
2012-04-27 16:11:56 +05:30
Anand Doshi
1dac43159a
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-27 15:31:35 +05:30
Anand Doshi
1ed4ef1946
fixes in setup
2012-04-27 15:30:23 +05:30
Nabin Hait
201f8ca821
fixed conflict in sales bom using ours
2012-04-27 14:03:06 +05:30
Nabin Hait
b931f37735
fixed conflict using ours
2012-04-27 13:59:39 +05:30
Nabin Hait
0d1daa8875
fld order change
2012-04-27 13:56:58 +05:30
Nabin Hait
de975ff307
fixed filtering issue in gs
2012-04-27 13:53:20 +05:30
Nabin Hait
762056aaa8
sales bom amendment issue fixed
2012-04-27 11:06:12 +05:30
Nabin Hait
727431b7b1
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-27 11:04:44 +05:30
Nabin Hait
b9d3ade2f4
sales bom issue fixed
2012-04-27 11:04:11 +05:30
Rushabh Mehta
2e16a01efd
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-26 19:02:32 +05:30
Rushabh Mehta
702473d65e
website updates
2012-04-26 19:01:35 +05:30
Nabin Hait
92ec4dcb6f
minor fixes
2012-04-26 13:13:10 +05:30
Nabin Hait
2453740621
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-26 13:03:18 +05:30
Nabin Hait
a6b7886175
resolved conflict while merging with master
2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-26 12:47:30 +05:30
Nabin Hait
5a6e641565
fixed batch issue
2012-04-26 11:11:34 +05:30
Rushabh Mehta
44279f87b4
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-25 18:25:29 +05:30
Nabin Hait
aa577ed82e
serial no fixes: sle creation through import data
2012-04-25 18:25:13 +05:30
Rushabh Mehta
dcfdfc317c
fixes to website module and fixed rename and double column bugs
2012-04-25 18:24:44 +05:30
Nabin Hait
04a276c934
Error fixed in gl netry when negative entry and cancel event
2012-04-25 16:08:45 +05:30
Nabin Hait
ed7de5fee2
posting time format validation
2012-04-25 15:07:46 +05:30
Nabin Hait
4626b27038
updated sales bom document
2012-04-24 15:17:56 +05:30
Nabin Hait
d98ca01082
fixed wrong serial no qty validation
2012-04-24 14:07:04 +05:30
Nabin Hait
3afecb9e30
update permission in appraisal
2012-04-24 13:32:26 +05:30
Nabin Hait
9a6dbfca8f
updated permlevel in address
2012-04-24 12:40:50 +05:30
Nabin Hait
dd828be432
updated patch list
2012-04-24 12:25:39 +05:30
Nabin Hait
3fb741c3ef
update role in address
2012-04-24 12:23:12 +05:30
Nabin Hait
663e971557
Make next document button hide/unhide
2012-04-24 11:39:54 +05:30
Nabin Hait
e6d808820a
Error fixed in notification control
2012-04-24 11:06:48 +05:30
Nabin Hait
4c9525139d
Error fixed in stock ledger netry batch related
2012-04-24 10:38:37 +05:30
Nabin Hait
8f9a953931
Update erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.py
2012-04-23 19:00:39 +05:30
Nabin Hait
69f6d79791
patch list modified
2012-04-23 18:27:53 +05:30
Nabin Hait
a45f44d805
remove def val from rv detail cost center
2012-04-23 18:26:08 +05:30
Nabin Hait
e848300958
patch list modified
2012-04-23 18:24:22 +05:30
Nabin Hait
ca102d567e
change cacheitem schema
2012-04-23 18:23:17 +05:30
Nabin Hait
2bbb086b10
Update erpnext/accounts/doctype/rv_detail/rv_detail.txt
2012-04-23 17:57:18 +05:30
Nabin Hait
9ceaccce86
create custom flds for bullows account
2012-04-23 16:04:41 +05:30
Nabin Hait
c425d8bd16
after sync cleanup
2012-04-23 16:04:16 +05:30
Nabin Hait
708917db50
some fixes in cleanup
2012-04-23 16:03:38 +05:30
Nabin Hait
6dbfcdbe5c
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-23 14:03:22 +05:30
Nabin Hait
b743bb6c10
ledger bal export format changed
2012-04-23 14:03:07 +05:30
Nabin Hait
51834a45a7
purchase invoice with write off feature
2012-04-23 12:47:12 +05:30
Nabin Hait
15230eb955
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-23 12:17:41 +05:30
Nabin Hait
6ed865f89a
Fld label based on currency
2012-04-23 10:37:28 +05:30
Rushabh Mehta
f4a8c87db5
kb bug fix
2012-04-23 10:31:29 +05:30
Nabin Hait
a8d83b6c51
update modified date
2012-04-20 14:02:44 +05:30
Nabin Hait
f19bb52b2a
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-20 13:59:22 +05:30
Nabin Hait
f7c506d69e
fixed conflict while merging with master branch
2012-04-20 13:58:43 +05:30
Anand Doshi
3d9f436ce9
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-20 13:43:05 +05:30
Anand Doshi
0f8e491bdd
removed Knowledge Base module, fixed questions page name
2012-04-20 13:42:43 +05:30
Nabin Hait
e72ae2a19b
fixed conflict
2012-04-20 13:41:09 +05:30
Rushabh Mehta
5bce61d58e
merge
2012-04-20 13:40:48 +05:30
Rushabh Mehta
f30d1a0515
report builder - sort, save, pre-select columns, Report DocType
2012-04-20 13:37:49 +05:30
Nabin Hait
0788570ce7
automatically write off feature in sales invoice
2012-04-20 13:31:05 +05:30
Anand Doshi
b301251090
Store base currency on client side
2012-04-20 11:51:27 +05:30
Anand Doshi
9e0221c58e
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-20 11:22:38 +05:30
Anand Doshi
b8660fb51c
fixes in production, porjects, packing slip
2012-04-20 11:21:47 +05:30
Anand Doshi
37df8abfc7
knowledge base module removed
2012-04-20 11:17:10 +05:30
Nabin Hait
b9984c8995
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-20 10:25:33 +05:30
Nabin Hait
239e79038f
Customer/customer group wise price list
2012-04-20 10:25:03 +05:30
Anand Doshi
7c135ed2fc
projects date_format to be fetched from wn.boot.sysdefaults
2012-04-19 17:58:56 +05:30
Rushabh Mehta
6ff95727e1
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-19 17:49:44 +05:30
Rushabh Mehta
a11bc07a7f
new report builder - todo: sort, save
2012-04-19 17:48:57 +05:30
Nabin Hait
94329abd02
modifed format for raw material report in prod plan
2012-04-19 16:08:33 +05:30
Nabin Hait
776e8572a2
issue fixed in prod plan
2012-04-19 15:00:48 +05:30
Nabin Hait
cba6f9148a
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-19 13:56:04 +05:30
Nabin Hait
40738aecfa
removed msgprint
2012-04-19 13:55:45 +05:30
Anand Doshi
b50a7a5ff9
Fix in rate fetching on get item details, when using inclusive rate
2012-04-19 12:00:49 +05:30
Anand Doshi
f642168a26
hr home: changed Allocate Leaves --> Leave Allocation Tool
2012-04-18 18:35:30 +05:30
Anand Doshi
7c67aad059
removed account_url from global defaults
2012-04-18 17:25:06 +05:30
Anand Doshi
2d56115c08
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-18 17:18:06 +05:30
Anand Doshi
619e16c956
removed account_url from global defaults
2012-04-18 17:17:02 +05:30
Rushabh Mehta
81c8ec2b89
knowledge base cleanup
2012-04-18 17:14:33 +05:30
Rushabh Mehta
46162c4e35
knowledge base cleanup
2012-04-18 16:59:37 +05:30
Rushabh Mehta
b194eb83a9
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-18 16:56:09 +05:30
Rushabh Mehta
edab76b274
knowledge base cleanup
2012-04-18 16:55:43 +05:30
Nabin Hait
66c7fbca8a
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-18 16:18:58 +05:30
Nabin Hait
6da191de03
negative stock fixes
2012-04-18 16:18:20 +05:30
Anand Doshi
8d1a0b4061
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-18 16:08:15 +05:30
Anand Doshi
385380125b
fixes in customize form, naming series form loading
2012-04-18 16:04:02 +05:30
Nabin Hait
97051ba79f
allow negative stock field in global defaults
2012-04-18 12:51:11 +05:30
Rushabh Mehta
5fc06554ff
question css
2012-04-18 12:50:09 +05:30
Nabin Hait
4776d3e097
Update erpnext/production/doctype/bill_of_materials/bill_of_materials.js
2012-04-18 12:37:01 +05:30
Rushabh Mehta
b12349a768
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-18 12:34:43 +05:30
Rushabh Mehta
3a9ddaf2c1
permission engine bugfix
2012-04-18 12:34:18 +05:30
Nabin Hait
7afc2124a6
allow negative qty feature
2012-04-18 12:04:20 +05:30
Anand Doshi
1fb128158c
fix in support ticket options of naming_series
2012-04-18 11:18:54 +05:30
Anand Doshi
40808e18f1
minor fixes
2012-04-17 18:43:29 +05:30
Nabin Hait
69e7eb4f3d
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-17 18:06:10 +05:30
Nabin Hait
5da9d56047
removed voucher date filter
2012-04-17 18:05:58 +05:30
Anand Doshi
c9d1ac4112
fix - show about of application
2012-04-17 13:54:53 +05:30
Anand Doshi
44f16eaefa
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-17 13:00:01 +05:30
Anand Doshi
b9e9197e5f
fix in doclistview - check if _user_tags exists before rendering
2012-04-17 12:59:18 +05:30
Rushabh Mehta
38bdf6c5e7
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-17 12:41:04 +05:30
Rushabh Mehta
2146fd17e7
new sales_browser
2012-04-17 12:40:37 +05:30
Anand Doshi
b2974e8e59
fix in delete check
2012-04-17 11:57:50 +05:30
Anand Doshi
24e18569d9
fixes in install docs for roles
2012-04-17 11:45:35 +05:30
Anand Doshi
acb3d56e02
fix in install docs
2012-04-17 11:39:18 +05:30
Anand Doshi
45a4edc9c9
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
...
Conflicts:
css/all-app.css
version.num
2012-04-17 11:19:15 +05:30
Nabin Hait
8c0dcd383b
some more fixes in support
2012-04-16 18:47:20 +05:30
Rushabh Mehta
6910ec1946
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-16 18:37:33 +05:30
Rushabh Mehta
71085592a4
fixed account_browser
2012-04-16 18:36:46 +05:30
Nabin Hait
fe127c216c
fixed issue in stock
2012-04-16 16:01:02 +05:30
Rushabh Mehta
6610d390e1
merge
2012-04-16 14:49:11 +05:30
Nabin Hait
6f89f1eb86
fixes in sales cycle
2012-04-16 14:44:47 +05:30
Nabin Hait
eb3bb01431
Update erpnext/selling/doctype/sales_order/sales_order.js
2012-04-16 13:41:06 +05:30
Rushabh Mehta
449f56db75
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-16 13:35:53 +05:30
Rushabh Mehta
6820dbf72d
framework build
2012-04-16 13:33:14 +05:30
Nabin Hait
eaf8b91402
hr reports cleanup
2012-04-16 12:31:36 +05:30
Nabin Hait
dbffc2d8d0
fixed hr issues
2012-04-16 12:22:47 +05:30
Rushabh Mehta
0c18b18b84
new framework build
2012-04-16 11:18:45 +05:30
Rushabh Mehta
c8abe5b2ad
style cleanups and new builds
2012-04-15 22:31:32 +05:30
Rushabh Mehta
cabfc65fe0
lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py)
2012-04-14 16:08:45 +05:30
Rushabh Mehta
f465b4fa76
merge
2012-04-13 19:06:05 +05:30
Rushabh Mehta
850c928a02
started rewrite of accounts browser
2012-04-13 19:04:55 +05:30
Anand Doshi
a202f00dc0
fixes in accounts
2012-04-13 16:03:27 +05:30
Anand Doshi
a0f6a3eab7
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-13 15:34:27 +05:30
Nabin Hait
f3348c5136
Merge branch 'master' into shf_rename
2012-04-13 14:41:56 +05:30
Nabin Hait
781a3c9b1f
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-13 14:41:45 +05:30
Nabin Hait
82c53871c7
fixes in se js
2012-04-13 14:39:04 +05:30
Nabin Hait
1c9061eff6
fixed conflict using theirs
2012-04-13 14:24:35 +05:30
Nabin Hait
6c615d9527
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-13 14:14:39 +05:30
Nabin Hait
b09b3bc253
all fields visible if any other custom purpose in stock entry
2012-04-13 14:13:02 +05:30
Anand Doshi
6af47a8c37
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-13 13:13:54 +05:30
Anand Doshi
b3ab90a01a
field changes in sp return tool
2012-04-13 12:38:34 +05:30
Anand Doshi
800b214ff3
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-13 12:37:23 +05:30
Anand Doshi
3abe9bd018
fixes in fieldnames and hide unnecessary fields in jv
2012-04-13 12:36:44 +05:30
Anand Doshi
b641ed2a1e
Added doc_type to JV Print Formats
2012-04-13 12:27:56 +05:30
Nabin Hait
7fca9e617d
fixes in global defaults
2012-04-13 12:18:06 +05:30
Rushabh Mehta
d76146372e
merge
2012-04-13 12:01:23 +05:30
Nabin Hait
b176e94b92
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-13 11:53:35 +05:30
Nabin Hait
e77164955b
removed repair fn, fixes in reports
2012-04-13 11:53:06 +05:30
Anand Doshi
7aafb7e19e
Purchase Requisition to Purchase Request
2012-04-13 11:52:17 +05:30
Rushabh Mehta
97ae17eaf7
merge
2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76
listing, module pages in appframe
2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82
fixes in sales cycle
2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0
fixes in doctype
2012-04-13 11:37:19 +05:30
Nabin Hait
a73b2965aa
cleanup and fixes
2012-04-13 11:02:26 +05:30
Anand Doshi
44e954f509
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-12 17:52:09 +05:30
Anand Doshi
09e8c4cd2d
further fixes
2012-04-12 17:51:53 +05:30
Nabin Hait
3cb148e53b
fixed conflict
2012-04-12 16:44:23 +05:30
Nabin Hait
de237e2bf7
error fixed
2012-04-12 16:36:01 +05:30
Anand Doshi
25bc68c7b2
fix in field names
2012-04-12 14:08:43 +05:30
Anand Doshi
654f6bfa85
fixes
2012-04-12 12:15:35 +05:30
Anand Doshi
9e6af24269
fixes in button function calling
2012-04-11 19:07:02 +05:30
Anand Doshi
5ed0b6971c
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-11 17:51:12 +05:30
Anand Doshi
e68fe505b9
custom fields creation patch - not to be executed automatically
2012-04-11 17:49:21 +05:30
Nabin Hait
c594bbcae0
address html issue fixed
2012-04-11 17:14:45 +05:30
Anand Doshi
ece64fa908
fixes
2012-04-10 19:18:00 +05:30
Anand Doshi
2424387651
fixes after sync testing
2012-04-10 19:14:37 +05:30
Nabin Hait
7a3faa9575
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-10 18:07:51 +05:30
Nabin Hait
af094b9daf
ledger balance export report in new format
2012-04-10 18:07:36 +05:30
Nabin Hait
0a8a487230
Update erpnext/stock/doctype/item/item.js
2012-04-10 16:50:23 +05:30
Anand Doshi
a9ccc7d6bd
naming series changes now saved as property setter
2012-04-10 15:31:48 +05:30
Anand Doshi
cfcaf38111
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-10 12:39:15 +05:30
Anand Doshi
966b6f1aa0
fix in patches
2012-04-10 12:38:17 +05:30
Rushabh Mehta
db05aacbc4
merge
2012-04-10 11:51:51 +05:30
Rushabh Mehta
d2cec5bd14
website style fixes
2012-04-10 11:51:08 +05:30
Anand Doshi
859cb72606
new favicon
2012-04-10 11:35:19 +05:30
Anand Doshi
9afb57ffb2
Syntax error fix in c_form.txt
2012-04-09 12:23:36 +05:30
Anand Doshi
87a2c5cc69
Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
...
Conflicts:
erpnext/accounts/doctype/c_form/c_form.txt
erpnext/patches/patch_list.py
erpnext/setup/doctype/permission_control/permission_control.py
2012-04-09 12:14:53 +05:30
Anand Doshi
85eb840ab4
fix in rename dt patch
2012-04-09 12:02:15 +05:30
Rushabh Mehta
b43f949e93
website smaller
2012-04-08 20:33:51 +05:30
Anand Doshi
82042f1cff
fixes after sync
2012-04-06 17:54:17 +05:30
Nabin Hait
3525d92cfb
c-form reload pach
2012-04-06 17:49:25 +05:30
Nabin Hait
c63a58d416
c-form reload pach
2012-04-06 17:42:02 +05:30
Nabin Hait
7da6ebc9af
Attachment option and total invoiced amt added in c-form
2012-04-06 17:30:53 +05:30
Nabin Hait
1299dab010
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-06 15:19:18 +05:30
Nabin Hait
05e4fc6eb6
Chart of account/cc link only for accounts user and account manager role in account home page
2012-04-06 15:19:02 +05:30
Anand Doshi
7e0479bc4c
cleanup of search criteria
2012-04-05 18:27:56 +05:30
Nabin Hait
9ba2e49468
Update erpnext/selling/doctype/sales_common/sales_common.js
2012-04-05 16:54:19 +05:30
Nabin Hait
758eed555c
Update erpnext/selling/doctype/sales_common/sales_common.js
2012-04-05 16:45:33 +05:30
Nabin Hait
f77c940fcf
fixed price list currency issue
2012-04-05 16:29:02 +05:30
Anand Doshi
fa0cd89a7c
change from labels to fieldname in cur_frm.cscript
2012-04-05 13:03:35 +05:30
Anand Doshi
00ceafb42d
fix in fiscal year of email digest
2012-04-03 18:43:17 +05:30
Anand Doshi
fc8bf7b1d8
add select type link fields in permission control
2012-04-03 13:49:14 +05:30
Anand Doshi
e9c505608a
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-03 13:23:14 +05:30
Anand Doshi
a6eb15df4a
fix in earning and deduction type field tyep
2012-04-03 13:22:20 +05:30
Anand Doshi
130dfaee8c
fix in todo
2012-04-03 12:18:35 +05:30
Nabin Hait
1b81badd58
validation changes for po item
2012-04-03 11:27:03 +05:30
Anand Doshi
be9562dcd5
rerun of rename_dt
2012-04-02 19:13:00 +05:30
Anand Doshi
5112b5b6b8
rerun of rename_dt
2012-04-02 19:12:29 +05:30
Anand Doshi
5c6cdb06b2
fix in decimal places
2012-04-02 15:02:34 +05:30
Rushabh Mehta
c7f1e5a54a
patch fixes
2012-04-02 14:24:35 +05:30
Rushabh Mehta
5475a3ca66
patch fixes
2012-04-02 14:06:46 +05:30
Anand Doshi
896c6fdc3c
fix in patch order
2012-04-02 14:06:33 +05:30
Anand Doshi
0442bc5d63
fix in patch list
2012-04-02 13:09:20 +05:30
Anand Doshi
c88ae2be4d
rename dt second cut
2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a
rename dt first cut
2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
...
Conflicts:
version.num
2012-03-29 15:35:08 +05:30
Anand Doshi
7ff696fb12
Merge branch 'renamedt' into shf_rename
...
Conflicts:
erpnext/patches/patch_list.py
2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82
Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt
2012-03-29 15:28:16 +05:30
Anand Doshi
0442b4e207
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-29 15:22:15 +05:30
Anand Doshi
66722dfe69
some buying listviews
2012-03-29 15:20:35 +05:30
Nabin Hait
dc8ce0190d
Merge branch 'master' into renamedt
2012-03-29 11:53:02 +05:30
Anand Doshi
8ac5ccae0a
fix in Sales Order-Receivable Voucher Mapper
2012-03-28 19:29:55 +05:30
Anand Doshi
9767f79845
fix in Sales Order-Receivable Voucher Mapper
2012-03-28 19:25:29 +05:30
Anand Doshi
419260298b
fix in mapper
2012-03-28 19:12:36 +05:30
Rushabh Mehta
635f359a71
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-28 15:18:28 +02:00
Rushabh Mehta
43d64c6116
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-28 15:17:59 +02:00
Anand Doshi
2f74d2e7bd
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-28 18:34:50 +05:30
Anand Doshi
779a365420
fix in print hide of amount in words
2012-03-28 18:31:26 +05:30
Anand Doshi
18ffd2a1b8
Merge branch 'master' into handlerupdate
2012-03-28 17:56:33 +05:30
Anand Doshi
c9456c18dc
listviews
2012-03-28 17:48:30 +05:30
Nabin Hait
79bc01e33d
updated rename_dt
2012-03-28 16:19:01 +05:30
Nabin Hait
6370ba8280
Merge branch 'master' of github.com:webnotes/erpnext into renamedt
2012-03-28 16:17:53 +05:30
Rushabh Mehta
0dfa140b7d
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-28 10:42:20 +02:00
Nabin Hait
e6340f26c2
mapper fix in DN_RV
2012-03-28 14:11:31 +05:30
Rushabh Mehta
c0fdaaf2c6
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-28 08:08:47 +02:00
Nabin Hait
5b00addaf7
reload mapper for checking ref value
2012-03-28 11:38:25 +05:30
Rushabh Mehta
bb769c5461
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-28 08:04:17 +02:00
Nabin Hait
13f789701e
erro fixed in reorder_item
2012-03-28 11:33:25 +05:30
Nabin Hait
df77a1f619
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-28 11:32:58 +05:30
Nabin Hait
6ed0450dba
reload mapper for checking ref value
2012-03-28 11:32:44 +05:30
Anand Doshi
b489297108
added delete_docformat in patch_list
2012-03-27 19:41:45 +05:30
Anand Doshi
2513e50dc4
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
...
Conflicts:
erpnext/website/doctype/style_settings/style_settings.txt
version.num
2012-03-27 19:37:10 +05:30
Anand Doshi
a30fbd004e
merge of sync handler and sync_file_db - first cut
2012-03-27 19:31:38 +05:30
Nabin Hait
a0a3ca3178
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-27 17:09:03 +05:30
Anand Doshi
3107096890
Merge branch 'master' of github.com:webnotes/erpnext into shf_merge
2012-03-27 15:02:38 +05:30
Anand Doshi
66ea30543c
sync patches
2012-03-27 15:02:30 +05:30
Anand Doshi
94d26f0338
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-26 22:34:18 +05:30
Anand Doshi
063fe503db
fix in queries in stock reconciliation
2012-03-26 22:32:34 +05:30
Rushabh Mehta
91c79305e8
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 12:11:22 +02:00
Nabin Hait
854935f12c
added docstatus in item get_query in PV
2012-03-26 15:40:56 +05:30
Nabin Hait
b66ade11e0
modified item code get_query in purchase cycle
2012-03-26 15:30:11 +05:30
Rushabh Mehta
20dc45f7bd
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 10:50:40 +02:00
Anand Doshi
c009450ef0
fix in item addition - details fetching
2012-03-26 14:17:30 +05:30
Nabin Hait
eecea8ef19
modified item code get_query in purchase cycle
2012-03-26 13:11:15 +05:30
Rushabh Mehta
4227d3fe58
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 08:23:18 +02:00
Nabin Hait
9329b5a461
modified item code get_query in purchase cycle
2012-03-26 11:52:16 +05:30
Rushabh Mehta
4a19819fe9
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 08:12:32 +02:00
Anand Doshi
4943af6d6c
fix in address issue - customer coming in supplied field
2012-03-26 11:42:09 +05:30
Rushabh Mehta
6fd7395101
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 08:03:19 +02:00
Nabin Hait
ea36202fbf
modified item code get_query in purchase cycle
2012-03-26 11:33:03 +05:30
Rushabh Mehta
5b80423dbb
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 07:55:45 +02:00
Nabin Hait
2bd086f1c3
modified item code get_query in purchase cycle
2012-03-26 11:25:31 +05:30
Rushabh Mehta
f06d6f34e7
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 07:48:21 +02:00
Nabin Hait
68764ce775
modified item code get_query in purchase cycle
2012-03-26 11:16:41 +05:30
Nabin Hait
e2fe5629f0
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-26 11:07:01 +05:30
Nabin Hait
bb6f10098e
updated rename_dt
2012-03-26 11:06:34 +05:30
Rushabh Mehta
9d0ea6a5f1
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 07:25:22 +02:00
Nabin Hait
6d4ee80cca
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-26 10:54:31 +05:30
Anand Doshi
964dee9f18
fix in stock reconciliation
2012-03-26 10:54:05 +05:30
Nabin Hait
67016dcfea
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-26 10:54:05 +05:30
Nabin Hait
f23d18316a
modified item code get_query in purchase cycle
2012-03-26 10:53:45 +05:30
Rushabh Mehta
339afe858c
link empty value and kb fix
2012-03-23 15:54:49 +05:30
Anand Doshi
5f9501d4d8
Merge branch 'sync_file_db' into shf_merge
...
Conflicts:
erpnext/projects/doctype/project/project.txt
2012-03-23 14:51:35 +05:30
Anand Doshi
2d4139cbeb
sync_handler_merge
2012-03-23 14:46:07 +05:30
Rushabh Mehta
b6f808846d
website fixes
2012-03-23 14:19:49 +05:30
Anand Doshi
9b56a8ada9
Merge branch 'handlerupdate' into sync_handler_merge
...
Conflicts:
js/all-app.js
version.num
2012-03-23 13:55:20 +05:30
Anand Doshi
134ca41db8
Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db
2012-03-23 12:45:05 +05:30
Anand Doshi
358304d216
fix in sales common regarding date formatting
2012-03-23 11:12:03 +05:30
Nabin Hait
191e55f1bc
sync ref db patch
2012-03-22 15:07:28 +05:30
Nabin Hait
f88326ba3f
sync ref db
2012-03-22 15:07:05 +05:30
Anand Doshi
7944b4b888
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-22 14:34:35 +05:30
Anand Doshi
3697534f10
Merge branch 'master' into handlerupdate
2012-03-22 14:32:10 +05:30
Rushabh Mehta
479061df9c
merge
2012-03-22 13:53:34 +05:30
Rushabh Mehta
fa0e7b6933
listing/messages fix
2012-03-22 13:44:04 +05:30
Anand Doshi
8463870a4f
Added Custom Scripts in setup page
2012-03-22 13:39:23 +05:30
Rushabh Mehta
1952f5b033
lead listview
2012-03-22 12:21:56 +05:30
Rushabh Mehta
6ac1d73731
lead listview
2012-03-22 12:10:49 +05:30
Rushabh Mehta
27cf13b541
merge
2012-03-22 11:37:56 +05:30
Rushabh Mehta
3f46696db2
removed slider ui
2012-03-22 11:37:08 +05:30
Anand Doshi
98f847c01f
fix in todo
2012-03-22 11:18:28 +05:30
Rushabh Mehta
a12a28bec6
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
...
Conflicts:
version.num
2012-03-22 06:35:35 +01:00
Anand Doshi
f1eb1b1508
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-22 11:02:46 +05:30
Anand Doshi
06fcfdfcde
assign to - allow comments
2012-03-22 11:01:38 +05:30
Rushabh Mehta
aaac794a8e
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-22 06:08:04 +01:00
Nabin Hait
40d4b4d939
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-22 10:34:13 +05:30
Nabin Hait
2f82219fd0
item query changes in stock entry
2012-03-22 10:32:06 +05:30
Nabin Hait
9066dcaba5
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-22 10:26:07 +05:30
Nabin Hait
afeeb9c484
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-22 10:24:39 +05:30
Nabin Hait
bad13149b2
item query changes in stock entry
2012-03-22 10:24:26 +05:30
Rushabh Mehta
d0f26026af
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 13:34:00 +01:00
Anand Doshi
29ed95ba22
simple fixes in todo
2012-03-21 18:02:17 +05:30
Anand Doshi
71d0b2a428
permission engine fix - is doctype submittable
2012-03-21 17:15:49 +05:30
Rushabh Mehta
b1f77d1bde
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 12:39:54 +01:00
Nabin Hait
f676824791
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-21 17:08:35 +05:30
Nabin Hait
653536596d
fax added in address display
2012-03-21 17:07:42 +05:30
Rushabh Mehta
2d229b423e
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 12:28:42 +01:00
Nabin Hait
d551281cbe
cdt not defined fixed
2012-03-21 16:57:08 +05:30
Rushabh Mehta
9851fcef2c
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 11:33:27 +01:00
Nabin Hait
93162f603d
update bom no options in stock entry
2012-03-21 16:02:44 +05:30
Rushabh Mehta
c1f8af58d1
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 11:29:06 +01:00
Nabin Hait
31fcc4bb36
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-21 15:57:07 +05:30
Nabin Hait
830b8baa9d
update bom no options in stock entry
2012-03-21 15:56:22 +05:30
Nabin Hait
2a68bdf231
Update erpnext/stock/doctype/stock_entry/stock_entry.txt
2012-03-21 15:50:14 +05:30
Rushabh Mehta
e07c38f5f5
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 11:06:38 +01:00
Nabin Hait
c37cb4d7c3
Update erpnext/stock/doctype/stock_entry/stock_entry.js
2012-03-21 15:35:41 +05:30
Nabin Hait
ac9adff1bb
Update erpnext/stock/doctype/stock_entry/stock_entry.py
2012-03-21 15:35:04 +05:30
Nabin Hait
7ff14ede3c
Update erpnext/stock/doctype/stock_entry/stock_entry.txt
2012-03-21 15:33:50 +05:30
Nabin Hait
0ad2ef2111
sync with respect to file
2012-03-21 15:02:39 +05:30
Rushabh Mehta
5bd00adeed
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 09:06:02 +01:00
Rushabh Mehta
983a171567
using font lato
2012-03-21 13:35:34 +05:30
Nabin Hait
e8da15cb5b
sync ref file
2012-03-21 12:45:14 +05:30
Rushabh Mehta
7aaea5e2be
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 08:00:11 +01:00
Rushabh Mehta
c01b7e9c75
website topbar fix, doclistnew, back fix
2012-03-21 12:29:56 +05:30
Nabin Hait
91375d64f1
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-21 12:05:30 +05:30
Rushabh Mehta
69c9065e7c
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 07:23:11 +01:00
Rushabh Mehta
fd563b4874
support ticket listview
2012-03-21 11:52:49 +05:30
Rushabh Mehta
f74ef4c64b
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 07:18:41 +01:00
Rushabh Mehta
a665c1f60d
stylefixes and listviews
2012-03-21 11:47:58 +05:30
Rushabh Mehta
dad4e3ebac
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 07:17:28 +01:00
Nabin Hait
5f04061291
changes in recurring invoice print format
2012-03-21 11:47:00 +05:30
Rushabh Mehta
0d1e918177
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 06:33:35 +01:00
Nabin Hait
39a24794eb
Purpose others to other
2012-03-21 11:02:50 +05:30
Rushabh Mehta
454c6ac716
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 05:42:31 +01:00
Rushabh Mehta
437c1b512c
listview update and form fix
2012-03-20 18:45:28 +05:30
Anand Doshi
310bc462b9
fix in doctype refactor patch
2012-03-20 17:49:23 +05:30
Nabin Hait
ba62cf3b5a
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-20 17:40:16 +05:30
Nabin Hait
39c26f4580
billing period in recurring sales invoice mail
2012-03-20 17:39:48 +05:30
Anand Doshi
986caee03d
clear item cache on update of certain docs
2012-03-20 17:30:31 +05:30
Nabin Hait
ceb9f41f15
lead organization fld added in quotation for printing: patch
2012-03-20 17:04:32 +05:30
Nabin Hait
de51040763
lead organization fld added in quotation for printing
2012-03-20 16:47:03 +05:30
Nabin Hait
9ff92369ad
lead organization fld added in quotation for printing
2012-03-20 16:44:15 +05:30
Anand Doshi
8347aad402
email settings separated from control panel
2012-03-20 14:54:25 +05:30
Rushabh Mehta
9b1afe197d
cleanup of form, rename, route, added fonts
2012-03-20 14:37:44 +05:30
Nabin Hait
93654a3e04
stock entry: new purpose others added
2012-03-20 14:31:14 +05:30
Nabin Hait
594ee37d26
patch list updated
2012-03-20 14:26:32 +05:30
Nabin Hait
547478f973
stock entry: new purpose others added in stock entry
2012-03-20 14:26:14 +05:30
Anand Doshi
d05aad6474
fix in POS invoice
2012-03-20 12:33:02 +05:30
Anand Doshi
6ba51ca693
POS Invoice fix
2012-03-20 12:24:51 +05:30
Anand Doshi
4f5e92a06c
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-20 12:17:50 +05:30
Anand Doshi
547ce9f9c8
POS Invoice fix
2012-03-20 12:11:38 +05:30
Anand Doshi
3401086d66
POS Invoice fix
2012-03-20 12:07:18 +05:30
Nabin Hait
bdd6877a4f
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-19 18:56:08 +05:30
Nabin Hait
31e0eacb7a
Update erpnext/selling/doctype/sales_order/sales_order.js
2012-03-19 18:54:11 +05:30
Rushabh Mehta
9d0fc767b2
merge
2012-03-19 18:44:33 +05:30
Nabin Hait
11824ffb90
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-19 18:43:51 +05:30
Nabin Hait
fdab486720
Update erpnext/selling/doctype/sales_order/sales_order.js
2012-03-19 18:43:07 +05:30
Rushabh Mehta
d48417c93b
slide navigation fixes
2012-03-19 18:42:13 +05:30
Nabin Hait
7107d4af2b
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-19 18:39:42 +05:30
Rushabh Mehta
8d8fa66e8f
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-19 14:06:12 +01:00
Nabin Hait
b7dce7da31
Update erpnext/stock/doctype/delivery_note/delivery_note.js
2012-03-19 18:35:57 +05:30
Rushabh Mehta
ffe9d358e8
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-19 12:40:07 +01:00
Nabin Hait
65ad3b1a0f
Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py
2012-03-19 17:09:14 +05:30
Nabin Hait
a189af48f6
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-19 16:27:42 +05:30
Nabin Hait
16d9f4942a
Update erpnext/setup/doctype/manage_account/manage_account.txt
2012-03-19 15:48:08 +05:30
Nabin Hait
422f7e99db
Update erpnext/selling/doctype/customer/customer.txt
2012-03-19 15:37:03 +05:30
Nabin Hait
9aa3777ba6
Update erpnext/setup/doctype/sales_person/sales_person.txt
2012-03-19 15:21:30 +05:30
Nabin Hait
e5d99f5ed1
Update erpnext/setup/doctype/manage_account/manage_account.txt
2012-03-19 15:15:20 +05:30
Anand Doshi
a7158f6ea9
fix in session expiry
2012-03-19 14:41:05 +05:30
Anand Doshi
5dabfdd920
sync doctype - first cut
2012-03-19 14:26:14 +05:30
Rushabh Mehta
6498cee998
fixed conflict
2012-03-19 09:01:16 +01:00
Nabin Hait
b6cd3316c4
error fixed in lease receipts client wise
2012-03-19 13:27:06 +05:30
Anand Doshi
f02c9e7b6c
fix in due_date fetching for receivable voucher
2012-03-19 11:43:24 +05:30
Rushabh Mehta
a0a53c90f1
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-19 06:12:43 +01:00
Nabin Hait
15a0271557
Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
2012-03-19 10:22:32 +05:30
Nabin Hait
9f5b2cd8d9
Update erpnext/stock/doctype/delivery_note/delivery_note.txt
2012-03-19 10:20:22 +05:30
Rushabh Mehta
7afaa8665d
major reworking of page navigation
2012-03-16 18:28:09 +05:30
Nabin Hait
3ffca32ace
rename dt patch updated
2012-03-16 16:21:44 +05:30
Nabin Hait
deac31fd2d
Update erpnext/selling/doctype/sales_common/sales_common.py
2012-03-16 15:14:27 +05:30
Nabin Hait
15afe87984
cost center will be fetched from other charges master
2012-03-16 15:11:02 +05:30
Rushabh Mehta
8e3d596cbc
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-15 16:44:19 +05:30
Rushabh Mehta
2438de4c9b
fixed tags in list2
2012-03-15 16:43:46 +05:30
Rushabh Mehta
2f052fd1ff
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-15 07:22:39 +01:00
Rushabh Mehta
5b9e0951d7
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
...
Conflicts:
version.num
2012-03-15 07:21:43 +01:00
Anand Doshi
92da889d32
fix in report builder saving
2012-03-15 11:50:26 +05:30
Anand Doshi
96188f0310
sync with gateway moved to defs
2012-03-15 11:11:57 +05:30
Rushabh Mehta
f47192c5ce
merge
2012-03-14 19:07:11 +05:30
Rushabh Mehta
08b670bddd
listing with stats
2012-03-14 19:06:20 +05:30
Rushabh Mehta
3b3e336fcc
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-14 13:25:19 +01:00
Anand Doshi
018f075b66
Merge branch 'master' into sync
2012-03-14 17:54:32 +05:30
Anand Doshi
0e2461fa7c
fix in qa inspection report link
2012-03-14 17:53:53 +05:30
Anand Doshi
4b7ddff4c9
patch after doctype.py refactor
2012-03-14 17:45:54 +05:30
Rushabh Mehta
3bbc7aeeb8
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
...
Conflicts:
version.num
2012-03-14 07:58:10 +01:00
Anand Doshi
0493897297
Merge branch 'master' into sync
...
Conflicts:
js/all-app.js
js/all-web.js
version.num
2012-03-14 12:24:37 +05:30
Anand Doshi
990599ad9a
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-14 12:20:58 +05:30
Nabin Hait
4af2c094cc
rename dt error fixed
2012-03-14 12:12:23 +05:30
Nabin Hait
1732905db8
rename dt error fixed
2012-03-14 12:04:16 +05:30
Anand Doshi
7854f81ca0
show todo, calendar and support desktop notifications
2012-03-14 12:01:13 +05:30
Nabin Hait
64f40fab6d
Rename doctype for more meaningful name
2012-03-14 11:07:00 +05:30
Rushabh Mehta
052b7e4049
fixed list->new->onload hooks
2012-03-13 15:19:06 +05:30
Nabin Hait
c6b989c9d7
update stock reco permission
2012-03-13 12:47:07 +05:30
Nabin Hait
9826ccce54
update stock reco permission
2012-03-13 12:45:53 +05:30
Rushabh Mehta
b9878d01e1
style fixes
2012-03-12 16:12:09 +05:30
Rushabh Mehta
ae4d1f973c
modules cleanup
2012-03-12 14:34:55 +05:30
Anand Doshi
5230aa89a2
Merge branch 'master' into sync
2012-03-12 13:28:15 +05:30
Rushabh Mehta
09595eee3e
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-12 13:21:07 +05:30
Nabin Hait
b5b39f0e48
update cost as per LPR and standard rate
2012-03-12 11:25:10 +05:30
Rushabh Mehta
9f89e35ebe
search selector fix for link
2012-03-09 17:51:39 +05:30
Rushabh Mehta
519f70b384
new autosuggest, other fixes
2012-03-09 16:44:21 +05:30
Nabin Hait
6715172211
sub contracted item are allowed to create po
2012-03-09 16:04:19 +05:30
Anand Doshi
4cc7d3e392
fix in support ticket rendering
2012-03-08 14:49:49 +05:30
Anand Doshi
c37c772678
fix in support ticket thread
2012-03-08 14:35:19 +05:30
Anand Doshi
20f63da794
fix in messages
2012-03-08 12:10:51 +05:30
Anand Doshi
eb55df0aa3
fix in messages
2012-03-08 12:06:27 +05:30
Anand Doshi
a6952c935c
doctype refactor first commit
2012-03-07 19:37:23 +05:30
Rushabh Mehta
9a1bdf7224
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-07 18:20:33 +05:30
Rushabh Mehta
f81a64e57f
new listing and changed wn.widgets.listing to wn.ui.listing
2012-03-07 18:19:41 +05:30
Nabin Hait
928e89a359
validation added in enquire
2012-03-07 13:11:24 +05:30
Nabin Hait
20f68b342b
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-07 12:51:19 +05:30
Nabin Hait
00260870d1
fixes in rv
2012-03-07 12:50:55 +05:30
Rushabh Mehta
0dd5da2299
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-06 18:41:52 +05:30
Rushabh Mehta
15da133de9
removed
2012-03-06 18:41:11 +05:30
Anand Doshi
18b6c1d4e9
minor changes in support ticket
2012-03-06 18:31:25 +05:30
Anand Doshi
2bc141f5db
fix in support ticket and email settings
2012-03-06 18:05:23 +05:30
Anand Doshi
a872d81983
trying to fix support ticket
2012-03-06 17:09:53 +05:30
Anand Doshi
2b60484bab
fix in reverted my company
2012-03-06 16:17:34 +05:30
Anand Doshi
bb64d302df
email digest fix
2012-03-06 11:42:32 +05:30
Nabin Hait
4e154d2233
removed rv series def val
2012-03-06 11:19:29 +05:30
Nabin Hait
b659457b4d
Removed def value from invoice naming series
2012-03-06 11:07:24 +05:30
Rushabh Mehta
60871c3f54
merge, doclist2
2012-03-05 18:29:34 +05:30
Rushabh Mehta
b9004bd6d0
doclist2
2012-03-05 18:28:33 +05:30
Nabin Hait
a528f54dcb
serial no fld print_hide=0
2012-03-05 17:45:38 +05:30
Rushabh Mehta
23d366a0be
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
...
Conflicts:
version.num
2012-03-05 11:31:04 +01:00
Nabin Hait
d342e2a4f2
reload item tables
2012-03-05 15:22:55 +05:30
Nabin Hait
cf9c4c45a5
export /import fld hide issue, discount issue
2012-03-05 15:21:35 +05:30
Rushabh Mehta
2f69c14e36
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-05 06:34:17 +01:00
Nabin Hait
d14bea3de5
patch list updated
2012-03-05 11:03:54 +05:30
Rushabh Mehta
38305a4b65
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-05 06:30:10 +01:00
Nabin Hait
3f958f7433
reload patch: field order changed
2012-03-05 10:59:02 +05:30
Nabin Hait
07e9ff3d30
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-05 10:55:24 +05:30
Nabin Hait
9cee59cd05
field order changed
2012-03-05 10:54:54 +05:30
Anand Doshi
821cb64987
fix in delivery note detail double entry
2012-03-03 16:27:48 +05:30
Anand Doshi
5478842d80
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-03 15:02:18 +05:30
Anand Doshi
146f17bf57
fix in delivery note submission - error caused due to default packed qty
2012-03-03 15:01:41 +05:30
Nabin Hait
97e1770296
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-02 17:15:21 +05:30
Nabin Hait
89a30ff7dc
Company 'all' removed from financial statements
2012-03-02 17:15:01 +05:30
Rushabh Mehta
c326075bdb
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-02 12:36:39 +01:00
Anand Doshi
c4e2d62333
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-02 17:05:33 +05:30
Anand Doshi
d536f16c53
user addition fix
2012-03-02 17:05:04 +05:30
Rushabh Mehta
bb8bf194a7
merge
2012-03-02 16:28:09 +05:30
Rushabh Mehta
ee92f4b8ca
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-02 16:25:35 +05:30
Rushabh Mehta
e45ffd6daf
activity date fix
2012-03-02 16:25:22 +05:30
Nabin Hait
a0801f7e39
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-02 16:06:46 +05:30
Nabin Hait
40c514612b
price list rate hiding issue
2012-03-02 16:06:33 +05:30
Anand Doshi
5cc8cd7dc1
do not record logins by demo@webnotestech.com
2012-03-02 15:42:08 +05:30
Nabin Hait
7e6b62eafd
print hide issue
2012-03-02 15:12:52 +05:30
Nabin Hait
fae852eb78
print hide issue
2012-03-02 15:10:51 +05:30
Rushabh Mehta
d0fb5e5d5d
merge
2012-03-02 14:58:39 +05:30
Nabin Hait
e0eb58ad26
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-02 14:57:56 +05:30
Nabin Hait
0d155a9135
print hide issue
2012-03-02 14:57:44 +05:30
Nabin Hait
1841d8defa
pr/dn no mapping through sales/pur return
2012-03-02 14:57:27 +05:30
Rushabh Mehta
a86f3e4507
cleanup of handler.js
2012-03-02 14:56:51 +05:30
Rushabh Mehta
58cdaa8590
fix in support ticket sending
2012-03-02 10:03:16 +01:00
Anand Doshi
31c3190681
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-02 13:13:04 +05:30
Anand Doshi
f68e3053a7
fix in support ticket.. checks sync_support_mails checkbox before sending emails
2012-03-02 13:11:53 +05:30
Nabin Hait
6db30a5b5a
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-02 12:29:23 +05:30
Nabin Hait
88986ca007
column break print hide issue
2012-03-02 12:29:08 +05:30
Anand Doshi
86fa67065e
Merge branch 'master' of github.com:webnotes/erpnext
...
Conflicts:
version.num
2012-03-02 12:21:01 +05:30
Anand Doshi
ecd8df8cfb
fix in user password change by system manager
2012-03-02 12:18:47 +05:30
Rushabh Mehta
305717a629
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-02 11:30:00 +05:30
Rushabh Mehta
37f531b6da
fixes to profile update
2012-03-02 11:29:09 +05:30
Anand Doshi
a7c2de6164
fix in user passwordgs
2012-03-02 11:27:50 +05:30
Anand Doshi
1e9b15eb5d
Merge branch 'master' of github.com:webnotes/erpnext
...
Conflicts:
version.num
2012-03-01 19:28:36 +05:30
Anand Doshi
e306a1f5e1
fix in sales and purchase common column hide
2012-03-01 19:25:33 +05:30
Nabin Hait
06292433a6
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 19:23:42 +05:30
Nabin Hait
760e91e949
print hide issue fixed in dn
2012-03-01 19:23:21 +05:30
Rushabh Mehta
84e0c6f7ba
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 18:59:01 +05:30
Rushabh Mehta
b5af807281
browser support
2012-03-01 18:58:29 +05:30
Nabin Hait
c4bc429cf7
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 18:56:33 +05:30
Nabin Hait
80d5261100
patch list updated
2012-03-01 18:56:06 +05:30
Rushabh Mehta
97ceffccce
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 18:53:50 +05:30
Rushabh Mehta
5d267a4ad7
browse support
2012-03-01 18:53:06 +05:30
Nabin Hait
1fb0058283
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 18:48:54 +05:30
Nabin Hait
db4af96388
issue fixed in pos
2012-03-01 18:47:51 +05:30
Rushabh Mehta
f6cca4f218
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 18:42:44 +05:30
Rushabh Mehta
70f7674aed
browse support and images
2012-03-01 18:42:05 +05:30
Anand Doshi
50b950b692
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 18:21:27 +05:30
Anand Doshi
68fb2c9b19
fix in import error due to indentation issues in item_grou[
2012-03-01 18:20:31 +05:30
Nabin Hait
96639d76b2
fixed indentation issue for custom script
2012-03-01 18:11:27 +05:30
Nabin Hait
823f192876
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 18:04:29 +05:30
Nabin Hait
423474da5c
transaction date issue in mapper patch
2012-03-01 18:04:08 +05:30
Nabin Hait
f237a67183
transaction date issue in mapper
2012-03-01 18:03:47 +05:30
Anand Doshi
232d725fd7
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 17:55:13 +05:30
Anand Doshi
e90e35dcda
restoring contact control
2012-03-01 17:52:31 +05:30
Nabin Hait
e3ce5b4e0c
voucher date removal issue fixed
2012-03-01 17:37:36 +05:30
Nabin Hait
be0b090d27
voucher date removal issue fixed
2012-03-01 17:31:51 +05:30
Nabin Hait
7807c6f173
clear cache patch
2012-03-01 15:58:30 +05:30
Nabin Hait
5b29deb968
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-01 15:52:12 +05:30
Nabin Hait
995d79421d
error fixed in patch
2012-03-01 15:51:33 +05:30
Anand Doshi
496d9a0980
Merge branch 'master' into navupdate
2012-03-01 14:55:22 +05:30
Anand Doshi
48ca42beb9
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
...
Conflicts:
version.num
2012-03-01 14:54:01 +05:30
Anand Doshi
08c8edb87f
fix in desktop and notifications
2012-03-01 14:53:05 +05:30
Nabin Hait
b95ad21208
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-03-01 14:48:13 +05:30
Nabin Hait
cf907f98bd
error fixed in posting balance
2012-03-01 14:47:56 +05:30
Rushabh Mehta
4a0cc249a9
merge
2012-03-01 13:59:47 +05:30
Rushabh Mehta
b473a4d489
added all_read condition to check if user can read
2012-03-01 13:58:17 +05:30
Anand Doshi
8acf46c725
update in patches
2012-03-01 13:58:13 +05:30
Anand Doshi
552093c3fd
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
...
Conflicts:
version.num
2012-03-01 13:51:23 +05:30
Anand Doshi
1f4efc77ac
fix in print formats and file rename
2012-03-01 13:50:33 +05:30
Rushabh Mehta
b6023a4d34
users - list condition
2012-03-01 13:47:51 +05:30
Rushabh Mehta
df33cb3a39
added activity avatar and removed menus.css
2012-03-01 13:44:09 +05:30
Rushabh Mehta
fe521fdbc2
add messages to always show and add attribution to patch
2012-03-01 13:39:09 +05:30
Rushabh Mehta
cc131af77a
add messages to always show
2012-03-01 13:35:07 +05:30
Rushabh Mehta
5ce587be33
merge
2012-03-01 13:32:06 +05:30
Rushabh Mehta
4c1e9e7db4
added attributions pages
2012-03-01 13:30:34 +05:30
Nabin Hait
2b9a13d81f
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-03-01 13:05:23 +05:30
Nabin Hait
eaf144a545
form cleanup in pur cycle
2012-03-01 13:05:04 +05:30
Nabin Hait
e73db0e331
set serial_no status="In Store" if purchase return cancelled
2012-03-01 12:26:12 +05:30
Anand Doshi
fba591cbb3
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-03-01 12:21:16 +05:30
Rushabh Mehta
111bca8220
activity image
2012-03-01 12:19:18 +05:30
Anand Doshi
91797904c9
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-03-01 12:17:54 +05:30
Anand Doshi
0e140962b8
Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults
2012-03-01 12:16:02 +05:30
Rushabh Mehta
cc6398e7c7
patch - update user_image in profile
2012-03-01 12:15:54 +05:30
Rushabh Mehta
b4a2f4c98f
activty images, website heading fix
2012-03-01 11:49:54 +05:30
Rushabh Mehta
ffb25fc36b
users button fix
2012-03-01 11:29:22 +05:30
Rushabh Mehta
94a2fecf9d
merge
2012-03-01 11:26:07 +05:30
Rushabh Mehta
428929b1f7
fixed permissions
2012-03-01 11:24:45 +05:30
Nabin Hait
bb4539e458
fixed conflict in version
2012-03-01 10:58:48 +05:30
Nabin Hait
6d517ff005
form cleanup: fixed callback issues
2012-03-01 10:57:23 +05:30
Nabin Hait
284a07e23b
if more info unchecked, more info in customer, supplier will be visible
2012-03-01 10:55:41 +05:30
Nabin Hait
177ca8dbbd
Description changed
2012-03-01 10:54:34 +05:30
Nabin Hait
63b275c97f
allowed debit and credit against same acc head
2012-03-01 10:35:35 +05:30
Rushabh Mehta
a4f454faa0
module page link fix
2012-02-29 19:19:01 +05:30
Rushabh Mehta
204e77d125
background, user_info
2012-02-29 19:09:20 +05:30
Rushabh Mehta
dc7e6889dd
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-02-29 19:06:56 +05:30
Anand Doshi
9a63996699
fix in account setup and user addition
2012-02-29 18:59:45 +05:30
Anand Doshi
fd5a213890
fix in account setup and user addition
2012-02-29 18:58:02 +05:30
Rushabh Mehta
4240ade0de
user background
2012-02-29 18:40:21 +05:30
Rushabh Mehta
412a65c23c
user background
2012-02-29 18:38:18 +05:30
Anand Doshi
0b8ac7fc68
fix in company setup
2012-02-29 18:33:39 +05:30
Anand Doshi
8049c27d78
Merge branch 'master' into navupdate
2012-02-29 16:22:30 +05:30
Rushabh Mehta
79ae16506b
minor fix
2012-02-29 15:23:25 +05:30
Rushabh Mehta
1572adf7f7
minor fix
2012-02-29 15:19:20 +05:30
Rushabh Mehta
864a47933e
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-02-29 15:11:27 +05:30
Rushabh Mehta
12852e73ab
added activity page
2012-02-29 15:11:06 +05:30
Anand Doshi
c70933373b
Merge branch 'master' of github.com:webnotes/erpnext
2012-02-29 14:06:25 +05:30
Anand Doshi
1304d97416
fix in import data page
2012-02-29 14:05:43 +05:30
Nabin Hait
41d6852218
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-02-29 11:25:09 +05:30
Nabin Hait
a3eee118fc
Added on_trash function for checking link of the master
2012-02-29 11:24:55 +05:30
Rushabh Mehta
a38bbe28ce
home page fixes
2012-02-29 10:55:43 +05:30
Nabin Hait
902b14592f
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-02-29 10:44:51 +05:30
Nabin Hait
22aa17bcce
changes in trend analyzer query
2012-02-29 10:44:27 +05:30
Nabin Hait
72d412567c
Update erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py
2012-02-29 10:43:21 +05:30
Rushabh Mehta
17da764d04
modules_setup
2012-02-28 18:56:56 +05:30
Rushabh Mehta
75d8f51e7d
messages and merge
2012-02-28 17:44:16 +05:30
Rushabh Mehta
aaf86ba4ef
added users
2012-02-28 17:40:13 +05:30
Nabin Hait
bef8b86331
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-02-28 14:14:49 +05:30
Nabin Hait
1f4aeab85c
error fixed in label_cleanup
2012-02-28 14:14:20 +05:30
Anand Doshi
6b69b4f6a4
Merge branch 'master' into navupdate
2012-02-28 13:51:29 +05:30
Anand Doshi
fc60335620
fix in leave application query
2012-02-28 13:51:04 +05:30
Nabin Hait
6c75cce4b9
fixed confilct
2012-02-28 11:46:43 +05:30
Anand Doshi
f9e4b16731
fix in scheduler related import issue
2012-02-28 11:31:46 +05:30
Anand Doshi
b37f22dc97
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-02-27 19:16:40 +05:30
Anand Doshi
ac144121ff
fix in hover effect
2012-02-27 19:16:24 +05:30
Rushabh Mehta
caebd1bff6
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-02-27 19:05:44 +05:30
Rushabh Mehta
1a5c9c5926
message reply
2012-02-27 18:56:31 +05:30
Nabin Hait
5bdd20c46b
dynamic label change, form cleanup, hide/unhide in purchase cycle
2012-02-27 18:46:51 +05:30
Anand Doshi
2b8c4d78f3
reload messages
2012-02-27 18:42:00 +05:30
Rushabh Mehta
ef29e55469
message delete
2012-02-27 18:41:11 +05:30
Anand Doshi
f9f73bfa55
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
...
Conflicts:
version.num
2012-02-27 18:32:38 +05:30
Anand Doshi
e68a1e5ecc
click effect on button
2012-02-27 18:31:15 +05:30
Rushabh Mehta
07a36a4baa
messages
2012-02-27 18:17:57 +05:30
Rushabh Mehta
05c339cea7
merge
2012-02-27 18:08:27 +05:30
Rushabh Mehta
fdea966198
messages
2012-02-27 18:03:54 +05:30
Anand Doshi
226df715b2
support ticket css
2012-02-27 17:24:47 +05:30
Anand Doshi
b25b4b7624
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-02-27 17:19:03 +05:30
Anand Doshi
5b1beebd33
Changed position of menus in navbar
2012-02-27 17:17:48 +05:30
Anand Doshi
0455ddfb98
Merge branch 'master' into navupdate
...
Conflicts:
version.num
2012-02-27 13:21:48 +05:30
Rushabh Mehta
a3211d3e94
calendar bug fixes
2012-02-27 12:54:47 +05:30
Rushabh Mehta
aa999df088
calendar fix
2012-02-27 12:54:04 +05:30
Nabin Hait
5b09122264
fixed conflict while merging
2012-02-27 12:52:46 +05:30
Nabin Hait
78805e702e
patch for form/label cleanup
2012-02-27 12:48:35 +05:30
Nabin Hait
0959341130
Form Cleanup: Dynamic label change, smart hide/unhide and dependencies
2012-02-27 12:47:40 +05:30
Nabin Hait
0cde984dc5
Update future year balances at the time of tranaction and acc bal reposting patch
2012-02-27 12:34:14 +05:30
Anand Doshi
01a7558589
added class 'web-footer' to text 'Powered by ERPNext' to make it visible in any background
2012-02-24 19:35:09 +05:30
Anand Doshi
d45ab64a85
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
...
Conflicts:
version.num
2012-02-24 19:28:09 +05:30
Anand Doshi
40ee8d6432
UI fixes in support ticket and desktop
2012-02-24 19:21:47 +05:30
Rushabh Mehta
a50b762d36
support link
2012-02-24 18:13:08 +05:30
Anand Doshi
db62876bc9
desktop icons
2012-02-24 17:56:00 +05:30
Anand Doshi
eaaf65131b
desktop: first cut
2012-02-24 15:29:07 +05:30
Rushabh Mehta
b73fa49f34
cleaned up kb
2012-02-24 15:07:39 +05:30
Rushabh Mehta
2886b95da0
added todo
2012-02-24 11:26:31 +05:30
Anand Doshi
ef041114bb
show submittable warning
2012-02-23 12:56:45 +05:30
Rushabh Mehta
3966f1dc5d
added license files
2012-02-23 12:35:32 +05:30
Rushabh Mehta
c023cdd0c0
Merge branch 'master' of github.com:webnotes/erpnext into navupdate
2012-02-23 11:46:39 +05:30
Rushabh Mehta
1a35574afe
redesigned scheduler
2012-02-23 11:46:28 +05:30
Anand Doshi
23b9de1582
Merge branch 'master' of github.com:webnotes/erpnext
2012-02-23 11:32:07 +05:30
Anand Doshi
bfa58a3516
allow deletion of products
2012-02-23 11:31:17 +05:30
Anand Doshi
9f94275d65
allow deletion of products
2012-02-23 11:27:40 +05:30
Nabin Hait
8569b7400a
Update erpnext/production/doctype/bill_of_materials/bill_of_materials.py
2012-02-23 10:46:24 +05:30
Anand Doshi
cab5b31ffa
change product's document type to Master
2012-02-22 18:33:39 +05:30
Nabin Hait
72129a8587
Product document type set as master
2012-02-22 18:30:20 +05:30
Rushabh Mehta
17773d0763
added docdiff and removed un-necessary files
2012-02-22 15:55:41 +05:30
Rushabh Mehta
c5471ddb8d
added setup and removed multi-col layout in body
2012-02-22 12:07:42 +05:30
Rushabh Mehta
2478363bba
Merge branch 'master' of github.com:webnotes/erpnext into navupdate
2012-02-21 19:04:14 +05:30
Rushabh Mehta
35fabf76a6
updated module pages
2012-02-21 19:03:50 +05:30
Anand Doshi
ffbfd2c60a
Update feed on submission
2012-02-21 18:15:31 +05:30
Rushabh Mehta
393d325e00
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 13:15:02 +01:00
Rushabh Mehta
085617ed12
merge latest
2012-02-21 17:31:04 +05:30
Anand Doshi
c70e8d9791
fix in remove_archive
2012-02-21 17:30:36 +05:30
Rushabh Mehta
50144468be
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 12:58:48 +01:00
Anand Doshi
b8fa4a37e5
fix in remove_archive
2012-02-21 17:27:24 +05:30
Rushabh Mehta
d025133b39
added module pages and other css updates
2012-02-21 17:26:50 +05:30
Rushabh Mehta
307da4f91b
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 12:17:20 +01:00
Anand Doshi
62a3872480
fix in remove_archive
2012-02-21 16:46:57 +05:30
Rushabh Mehta
534b6a7d7f
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 12:16:13 +01:00
Anand Doshi
5ff541b53c
fix in remove_archive patch
2012-02-21 16:44:31 +05:30
Rushabh Mehta
7a867fc1f8
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 12:00:02 +01:00
Anand Doshi
8e703ef26f
packing slip fix
2012-02-21 16:29:46 +05:30
Rushabh Mehta
0c410b8261
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 11:58:03 +01:00
Anand Doshi
0bcc20f980
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 16:26:36 +05:30
Anand Doshi
ff33677624
Packing Slip Fix
2012-02-21 16:26:08 +05:30
Nabin Hait
e1f976ce05
deleted supp quotation
2012-02-21 14:33:45 +05:30
Rushabh Mehta
02b36eba1c
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 09:54:33 +01:00
Nabin Hait
b461e1788a
patch list updated
2012-02-21 14:22:06 +05:30
Rushabh Mehta
cdf0b7a502
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 09:45:46 +01:00
Anand Doshi
f9e9000092
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 14:12:39 +05:30
Anand Doshi
c05ee5bf64
patch to remove archive
2012-02-21 14:12:13 +05:30
Rushabh Mehta
25e57421f7
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 09:17:30 +01:00
Nabin Hait
4b36c1e8f4
insert after fld should be no copy in custom fld
2012-02-21 13:43:59 +05:30
Rushabh Mehta
2fe8f12424
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 09:06:55 +01:00
Nabin Hait
8e9b578c00
expected delivery date can be equal to po date, not before po date
2012-02-21 13:35:28 +05:30
Rushabh Mehta
e55778627f
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 08:57:24 +01:00
Nabin Hait
1a7cd16dba
reorder qty fld in item
2012-02-21 13:26:49 +05:30
Nabin Hait
5fe6760406
reorder level checking based on stores and reserved warehouse
2012-02-21 13:25:27 +05:30
Rushabh Mehta
98902f82db
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-21 07:24:52 +01:00
Rushabh Mehta
6e156c748b
moved to boostrap 2.0
2012-02-21 11:19:24 +05:30
Nabin Hait
468008717b
removed extra cond from bom
2012-02-21 11:14:49 +05:30
Rushabh Mehta
4dc2f43c0d
moving to bootstrap 2.0
2012-02-21 10:30:43 +05:30
Rushabh Mehta
f70760d8c8
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-20 14:09:09 +01:00
Anand Doshi
0b3f4d40c4
fix in support ticket and email digest
2012-02-20 18:38:33 +05:30
Rushabh Mehta
09a897afe4
added selling-home
2012-02-20 18:30:52 +05:30
Rushabh Mehta
d25e0957d4
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-20 12:06:55 +01:00
Anand Doshi
2a7fa0451c
todo_item patch
2012-02-20 16:36:08 +05:30
Anand Doshi
09ef7dc416
Merge branch 'latest' of github.com:webnotes/erpnext into latest
...
Conflicts:
version.num
2012-02-20 16:33:28 +05:30
Anand Doshi
c3023be794
notifications of todo items
2012-02-20 16:31:55 +05:30
Rushabh Mehta
3f29b85f5d
2 col layout in form, docbrowser and home
2012-02-20 15:40:29 +05:30
Rushabh Mehta
cb1ab98bec
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-20 08:35:47 +01:00
Nabin Hait
f361289147
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-20 13:05:01 +05:30
Nabin Hait
6ac0be5fb2
delete all cancelled gl entry on account deletion
2012-02-20 13:04:36 +05:30
Rushabh Mehta
5ceab06bb5
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-20 08:06:37 +01:00
Rushabh Mehta
13531b73eb
form bugfix and otehr minor fixes
2012-02-20 12:35:23 +05:30
Nabin Hait
db0df4fd53
over-wrinting of child tables data in import_data
2012-02-17 15:55:51 +05:30
Rushabh Mehta
7b7af279cf
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-17 08:18:30 +01:00
Rushabh Mehta
aa848bee28
website css cleanups + dropdown in top toolbar
2012-02-17 12:06:33 +05:30
Rushabh Mehta
639c268abd
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-17 05:59:46 +01:00
Anand Doshi
e31d94ffc4
fix in control panel issue of sales and purchase return wizard
2012-02-17 10:27:46 +05:30
Rushabh Mehta
265c41b604
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-16 12:05:24 +01:00
Anand Doshi
e7ecb86ce7
roles for a new company's first user
2012-02-16 16:34:47 +05:30
Rushabh Mehta
ee5ba8105e
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-16 11:46:59 +01:00
Anand Doshi
aa92ecdd26
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-16 15:56:57 +05:30
Anand Doshi
8aa841866f
add Website Manager Role to first user
2012-02-16 15:56:36 +05:30
Rushabh Mehta
22eb57a217
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-16 11:00:23 +01:00
Nabin Hait
60e81ce8f5
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-16 15:29:09 +05:30
Rushabh Mehta
7c76f80966
gateway patch
2012-02-16 10:58:45 +01:00
Nabin Hait
195b620787
callback issue in packing slip
2012-02-16 15:21:39 +05:30
Rushabh Mehta
1b1179477b
added patch
2012-02-16 15:11:28 +05:30
Rushabh Mehta
8425c87d5f
fixed old style file names
2012-02-16 13:01:28 +05:30
Anand Doshi
761a044cd7
fix in user addition email sending..
2012-02-16 12:47:11 +05:30
Anand Doshi
ec1af179cb
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-16 12:08:10 +05:30
Anand Doshi
f8395343f7
fix in password not copied to server database during company creation
2012-02-16 12:07:38 +05:30
Nabin Hait
da1f48b96e
mentioed account type for some tax/chargeable account
2012-02-16 10:55:05 +05:30
Nabin Hait
470e18a380
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-15 17:31:56 +05:30
Nabin Hait
2d8ac7f3f9
fixed asynchronus issue
2012-02-15 17:31:23 +05:30
Anand Doshi
2c2991c3b7
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-15 15:42:34 +05:30
Anand Doshi
65bc9db85e
File Data rename
2012-02-15 15:42:18 +05:30
Rushabh Mehta
f27b67b474
fix in change password
2012-02-15 10:45:29 +01:00
Nabin Hait
237ac638f5
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-15 14:28:57 +05:30
Nabin Hait
ab90ee04f5
callback issues and item default get most priority
2012-02-15 14:28:02 +05:30
Rushabh Mehta
533bc77976
rolling back gateway changes
2012-02-15 09:35:42 +01:00
Nabin Hait
0e14191163
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-14 18:55:34 +05:30
Nabin Hait
13e62ccbc9
clear cache patch
2012-02-14 18:55:01 +05:30
Rushabh Mehta
c9b10fd8d4
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-14 17:25:40 +05:30
Rushabh Mehta
eec8e92604
login, analytics fix
2012-02-14 17:25:31 +05:30
Anand Doshi
518202f9f2
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-14 16:16:42 +05:30
Anand Doshi
737c2f9432
fix in login as
2012-02-14 16:16:13 +05:30
Nabin Hait
75ef7c7a89
def val of is_subcontracted is NO
2012-02-14 16:08:22 +05:30
Nabin Hait
3d794a682d
required by date should be mapped in indent-po
2012-02-14 15:25:11 +05:30
Nabin Hait
461a071dfa
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-14 15:13:52 +05:30
Nabin Hait
84d73103f8
sales team mapping issue in SO-DN and SO-RV
2012-02-14 15:13:21 +05:30
Anand Doshi
ec6f9fedd6
Fix in smtplib import issue
2012-02-14 13:54:04 +05:30
Anand Doshi
507cb3c592
add website manager patch
2012-02-14 12:58:47 +05:30
Anand Doshi
b2be11cad1
error due to old packing slip hide fields in feature setup
2012-02-14 12:45:55 +05:30
Rushabh Mehta
56c5ae5bc8
version
2012-02-14 11:47:05 +05:30
Rushabh Mehta
afaac60982
made all.js and all.css and all guests share same session
2012-02-14 11:44:13 +05:30
Nabin Hait
5bd88d99b5
fixes
2012-02-14 11:39:42 +05:30
Nabin Hait
7eda1cac27
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-14 09:57:57 +05:30
Anand Doshi
2c582d5f65
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-13 19:00:24 +05:30
Anand Doshi
d7ddea1e2a
domain list patch
2012-02-13 18:59:43 +05:30
Nabin Hait
c45337bf97
Merge branch 'stable' of github.com:webnotes/erpnext into stable
2012-02-13 18:25:52 +05:30
Nabin Hait
409612457b
error fixed in trash control
2012-02-13 18:24:14 +05:30
Rushabh Mehta
bfc03cf8bd
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-13 13:41:51 +01:00
Rushabh Mehta
a9bd79487d
company whitelist fix
2012-02-13 13:41:45 +01:00
Anand Doshi
ce0c65f173
Merge branch 'stable' into latest
2012-02-13 18:01:23 +05:30
Anand Doshi
5fe5df370f
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-13 17:57:45 +05:30
Anand Doshi
e8928b8bff
website settings
2012-02-13 17:56:59 +05:30
Rushabh Mehta
f17ce7bc67
added whitelist check
2012-02-13 16:50:52 +05:30
Nabin Hait
e63ea67b54
error fixed in patch
2012-02-13 15:38:15 +05:30
Anand Doshi
82cfe4b28d
Merge branch 'stable' of github.com:webnotes/erpnext into stable
2012-02-13 15:30:24 +05:30
Nabin Hait
42852a88dc
account type patch added in patch list
2012-02-13 15:29:51 +05:30
Anand Doshi
702f174265
call update item details in post render
2012-02-13 15:29:41 +05:30
Rushabh Mehta
ff0946bbda
naming fix in web page, list style
2012-02-13 15:26:17 +05:30
Nabin Hait
bd0c05bf94
Mentioned account type in default accounts
2012-02-13 14:48:34 +05:30
Anand Doshi
945b3c4680
Domain Name list in Website Settings
2012-02-13 14:04:54 +05:30
Nabin Hait
7949b33b70
Logout session if user deleted
2012-02-13 12:43:38 +05:30
Nabin Hait
043b0f26bd
Merge branch 'stable' of github.com:webnotes/erpnext
2012-02-13 12:26:45 +05:30
Nabin Hait
bf0d92e125
deleted and disabled users excluded in applicable to and approver link fields
2012-02-13 12:22:08 +05:30
Nabin Hait
b0fd0b3615
Edited through patch
2012-02-13 11:34:36 +05:30
Anand Doshi
ba746dfb2f
Stop support ticket refresh on send, if there is a server message
2012-02-10 15:46:54 +05:30
Anand Doshi
701e0559e9
Merge branch 'stable' into latest
2012-02-10 13:44:03 +05:30
Anand Doshi
00f9b58bba
Do not refresh is there is an exception
2012-02-10 13:43:39 +05:30
Anand Doshi
15d2d45b36
Merge branch 'stable' into latest
2012-02-10 10:57:26 +05:30
Anand Doshi
110047ea5b
Debit/Credit note creation on purchase/sales return
2012-02-10 10:48:35 +05:30
Anand Doshi
dae6e1e6a2
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-09 12:48:13 +05:30
Anand Doshi
ad37575701
First name and last name in setup account dialog
2012-02-09 12:48:04 +05:30
Rushabh Mehta
96765f170d
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-09 12:46:17 +05:30
Rushabh Mehta
0b2874afdb
fix to install
2012-02-09 12:45:50 +05:30
Anand Doshi
95e89de21d
Merge branch 'stable' into latest
...
Conflicts:
erpnext/home/page/event_updates/event_updates.js
2012-02-09 12:23:15 +05:30
Anand Doshi
3801804a8a
First Name and Last Name in setup account dialog box
2012-02-09 12:16:47 +05:30
Anand Doshi
83302dfe63
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-08 16:23:47 +05:30
Anand Doshi
cf5f0232a9
Merge branch 'stable' into latest
2012-02-08 16:23:35 +05:30
Anand Doshi
df3f452a14
Fix in Purchase Invoice creation due to item tax stringify issue
2012-02-08 16:22:59 +05:30
Rushabh Mehta
f16e32eca1
report builder fix'
2012-02-08 16:16:28 +05:30
Rushabh Mehta
b8d6497818
many style fixes
2012-02-08 12:33:13 +05:30
Anand Doshi
a685379d6b
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-08 11:06:12 +05:30
Anand Doshi
9908d6e4be
Merge branch 'stable' into latest
2012-02-08 11:05:47 +05:30
Rushabh Mehta
a1f3764238
about us style fix
2012-02-08 10:51:08 +05:30
Anand Doshi
c9fcc05792
Allow IS POS to be set as default from customize form view
2012-02-08 10:46:27 +05:30
Rushabh Mehta
02ec8c06fb
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-08 10:44:33 +05:30
Rushabh Mehta
3fd279977b
website p sty;e
2012-02-08 10:44:02 +05:30
Anand Doshi
c6eea1e1ca
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-08 10:24:16 +05:30
Anand Doshi
88e4a0ffc2
Merge branch 'stable' into latest
2012-02-08 10:24:03 +05:30
Rushabh Mehta
bd20d29dae
pre style
2012-02-08 10:23:16 +05:30
Anand Doshi
d7ac84f430
removed msgprint in pending po items to receive report
2012-02-08 10:18:30 +05:30
Anand Doshi
a629fa3f05
Merge branch 'stable' into latest
2012-02-07 18:02:42 +05:30
Anand Doshi
02035d071a
Fix in import docs containing utf-8 encoding
2012-02-07 17:57:40 +05:30
Rushabh Mehta
a7f0c448bb
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-07 14:58:14 +05:30
Rushabh Mehta
4d20b2246c
style fixes
2012-02-07 14:57:49 +05:30
Anand Doshi
f812acf063
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-07 14:51:56 +05:30
Anand Doshi
8d3d2a9905
Merge branch 'stable' into latest
2012-02-07 14:51:38 +05:30
Anand Doshi
e59f456ad4
If support ticket doesnt have body, then do not append in reply to string
2012-02-07 14:50:50 +05:30
Rushabh Mehta
5b625fa592
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-07 14:32:20 +05:30
Rushabh Mehta
f9620eaf44
fix to product, blog
2012-02-07 14:31:49 +05:30
Anand Doshi
b65363aa46
Merge branch 'stable' into latest
2012-02-07 14:28:29 +05:30
Anand Doshi
188a499f45
Fix in default customer group fetch while converting lead to customer
2012-02-07 14:28:05 +05:30
Anand Doshi
4e47c48707
Merge branch 'stable' into latest
2012-02-07 13:33:10 +05:30
Anand Doshi
7e8082e193
Fixed mapping of conversion rate for PO-PR and PO-PV
2012-02-07 13:32:20 +05:30
Rushabh Mehta
518533fde0
added sitemap, rss feeds
2012-02-07 13:29:31 +05:30
Rushabh Mehta
9c7fe3bce4
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-07 11:43:51 +05:30
Rushabh Mehta
8b96b05163
fixes to products
2012-02-07 11:43:41 +05:30
Rushabh Mehta
002340080d
fixes to products
2012-02-07 07:08:05 +01:00
Anand Doshi
67d2c8396c
Merge branch 'latest' of github.com:webnotes/erpnext into latest
...
Conflicts:
version.num
2012-02-07 10:59:29 +05:30
Anand Doshi
e00e70841c
Merge branch 'stable' into latest
...
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6
Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues
2012-02-07 10:48:11 +05:30
Rushabh Mehta
f35992f695
top bar to accept url
2012-02-07 10:39:17 +05:30
Anand Doshi
99e7f3d7a4
Fix in valuation_control.py: eval requires a string. does not accept None.
2012-02-06 18:06:34 +05:30
Rushabh Mehta
0a45f96c48
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-06 17:40:46 +05:30
Rushabh Mehta
28307193a1
item group txt
2012-02-06 17:40:37 +05:30
Rushabh Mehta
cc54fd46bc
website fixes
2012-02-06 13:09:08 +01:00
Rushabh Mehta
e651648b1b
added missing icons
2012-02-06 16:28:06 +05:30
Rushabh Mehta
a7e68f7cd7
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-06 15:33:37 +05:30
Rushabh Mehta
e219db0e20
moved wnf.py to erpnext and added website manager role
2012-02-06 15:33:08 +05:30
Rushabh Mehta
b4244bacba
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-06 10:59:48 +01:00
Rushabh Mehta
4167e2f97a
patch fix
2012-02-06 10:58:48 +01:00
Rushabh Mehta
74fab55948
add home in website patch
2012-02-06 14:34:42 +05:30
Rushabh Mehta
594a0ca11d
fix in related page
2012-02-06 12:52:15 +05:30
Rushabh Mehta
af1cb632d6
bugfix to topbar
2012-02-06 07:29:52 +01:00
Rushabh Mehta
04048ff890
Merge branch 'stable' of github.com:webnotes/erpnext into latest
2012-02-06 07:12:43 +01:00
Anand Doshi
7e13f9b4b5
Fix in email digest due to unicode change
2012-02-06 11:41:25 +05:30
Rushabh Mehta
fd5005567b
Fix in setup role permissions
2012-02-06 06:34:04 +01:00
Rushabh Mehta
7d5575ea3a
Merge branch 'stable' of github.com:webnotes/erpnext into latest
2012-02-04 11:53:08 +01:00
Anand Doshi
b05f1a68f5
support ticket send issue
2012-02-04 16:22:21 +05:30
Rushabh Mehta
eba29ab88a
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-04 09:54:10 +05:30
Rushabh Mehta
6147451da3
refactored patches, bug fix for assign_to
2012-02-04 09:53:25 +05:30
Rushabh Mehta
cc43b7e927
Merge branch 'stable' of github.com:webnotes/erpnext into latest
2012-02-03 13:35:59 +01:00
Anand Doshi
3f711e2cb0
Fix in support ticket response issue
2012-02-03 18:03:32 +05:30
Rushabh Mehta
479670e4e1
added unicode to mysql, fix in about us
2012-02-03 16:56:18 +05:30
Rushabh Mehta
b4c814484e
fix to patch
2012-02-03 13:36:44 +05:30
Rushabh Mehta
63d669f390
updated feed for comments and login
2012-02-03 12:56:12 +05:30
Rushabh Mehta
adc9a61bd7
bugfix
2012-02-02 16:45:26 +05:30
Rushabh Mehta
50e2cfe78e
dateutil.js/patch fix
2012-02-02 16:40:01 +05:30
Anand Doshi
6d5cd01e03
Merge branch 'stable' into latest
2012-02-02 15:36:58 +05:30
Anand Doshi
2cb047d5a4
Added search field 'account_type' in account doctype
2012-02-02 15:36:34 +05:30
Anand Doshi
62427a6024
Merge branch 'stable' into latest
2012-02-02 15:23:33 +05:30
Anand Doshi
962c2aa80d
Auto fetch default bank account for jv of type Bank Voucher
2012-02-02 15:22:11 +05:30
Anand Doshi
8694dbb754
Merge branch 'stable' into latest
2012-02-02 14:07:55 +05:30
Anand Doshi
fd11313138
Support ticket response text fix
2012-02-02 14:07:39 +05:30
Anand Doshi
1a3bce3676
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-02-02 13:45:00 +05:30
Anand Doshi
32e1fa22cd
Merge branch 'stable' into latest
2012-02-02 13:44:32 +05:30
Rushabh Mehta
63adcb7355
patch update
2012-02-02 13:44:28 +05:30
Anand Doshi
ce25e169ab
Show only last response in support ticket response message
2012-02-02 13:44:05 +05:30
Rushabh Mehta
a3d21a46e8
version
2012-02-02 13:43:20 +05:30
Rushabh Mehta
7018b19f42
added website settings, refactored home
2012-02-02 13:42:28 +05:30
Anand Doshi
0c9cde9f62
Merge branch 'stable' into latest
...
Conflicts:
version.num
2012-02-02 12:43:39 +05:30
Anand Doshi
354dd9b35a
Allow changing export_rate if discount=0, then calculate discount based on ref_rate and export_rate (valid for non inclusive pricing)
2012-02-02 12:42:14 +05:30
Anand Doshi
a9a5128402
Merge branch 'stable' into latest
...
Conflicts:
erpnext/stock/doctype/item/item.txt
index.html
version.num
2012-02-02 11:44:25 +05:30
Anand Doshi
75d30b803f
Packing Slip and its patches
2012-02-02 11:38:15 +05:30
Rushabh Mehta
d47e1d14b7
added related page and other cleanups
2012-02-01 18:02:33 +05:30
Rushabh Mehta
9c69914cf6
todo fix
2012-02-01 15:03:54 +05:30
Rushabh Mehta
9ef63f93d6
moved back to 'index.cgi' model
2012-02-01 14:47:29 +05:30
Anand Doshi
3325d0db74
Patch to set docstatus=2 for purchase returned serial no
2012-02-01 11:36:31 +05:30
Anand Doshi
4f948e03be
Set docstatus as 2 for a purchase returned serial no
2012-02-01 11:27:36 +05:30
Rushabh Mehta
ab1148cbc9
added products, custom pages and footer
2012-01-31 18:01:16 +05:30
Anand Doshi
6afc6818a3
Check for duplicate challan number only in submitted purchase receipts
2012-01-31 17:21:04 +05:30
Anand Doshi
0717ca63b2
Fix in Purchase Return - Serial No. status issue
2012-01-31 16:20:37 +05:30
Anand Doshi
6c95ccb8f5
Net total calculation fix
2012-01-30 14:28:31 +05:30
Rushabh Mehta
bc5ec4f19e
version
2012-01-30 14:02:41 +05:30
Rushabh Mehta
d6840b202a
added products + cleanups
2012-01-30 14:00:46 +05:30
Anand Doshi
2729123868
Fix add user from my company
2012-01-30 12:50:18 +05:30
Anand Doshi
5f29438b1c
Fix in add user in my company
2012-01-30 12:44:59 +05:30
Anand Doshi
f3d3105d9a
Password fix on add user
2012-01-30 12:40:07 +05:30
Anand Doshi
e72de12993
Merge branch 'master' into latest
...
Conflicts:
index.html
version.num
2012-01-30 11:59:05 +05:30
Anand Doshi
69cfc5566a
Email settings check on save
2012-01-30 11:54:59 +05:30
Anand Doshi
d3db70bb72
Supplier rename fix
2012-01-30 11:08:47 +05:30
Anand Doshi
327269fbc6
Check email settings while saving
2012-01-27 18:49:51 +05:30
Rushabh Mehta
3a751e8f82
added blog subscriber, unsubscribe
2012-01-27 18:00:14 +05:30
Rushabh Mehta
ad10c695ff
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-01-27 15:57:32 +05:30
Rushabh Mehta
c8d2e73ee6
added blog
2012-01-27 15:57:17 +05:30
Anand Doshi
76a4caeada
fix in send notification part of recurring invoices
2012-01-27 14:34:26 +05:30
Anand Doshi
f5738817db
fix in recurring invoice
2012-01-27 14:18:09 +05:30
Anand Doshi
707cd06606
Merge branch 'latest' of github.com:webnotes/erpnext into latest
...
Conflicts:
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
2012-01-27 12:30:35 +05:30
Anand Doshi
02c662936f
Merge branch 'master' into latest
2012-01-27 12:28:21 +05:30
Anand Doshi
74d1b65105
changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch
2012-01-27 12:25:09 +05:30
Rushabh Mehta
51e51da63f
added about_us
2012-01-27 12:17:09 +05:30
Rushabh Mehta
4adaae6974
version
2012-01-25 18:49:32 +05:30
Rushabh Mehta
949496c31b
added website.page.contact
2012-01-25 18:48:46 +05:30
Anand Doshi
af1ad9a31e
Merge branch 'latest' of github.com:webnotes/erpnext into latest
...
Conflicts:
version.num
2012-01-25 17:27:57 +05:30
Anand Doshi
6e174cc2c4
Merge branch 'master' into latest
...
Conflicts:
erpnext/setup/doctype/notification_control/notification_control.js
index.html
version.num
2012-01-25 17:21:14 +05:30
Anand Doshi
46848a48fe
Show DocType Labels instead of DocType names in Customize Form View
2012-01-25 17:15:46 +05:30
Rushabh Mehta
4b1fe0528a
added home template
2012-01-25 15:06:28 +05:30
Anand Doshi
04a115e771
Fix: Logout user on disabling profile
2012-01-25 12:52:38 +05:30
Rushabh Mehta
9c7a01ade9
starting up
2012-01-25 11:04:54 +05:30
Rushabh Mehta
a8ad3907db
added website page, home, patch
2012-01-25 10:37:35 +05:30
Anand Doshi
c655e37f1a
Fixes in production and stock modules
2012-01-25 09:58:06 +05:30
Anand Doshi
d194e6b5cf
Fix: show message if contact doesn't have email if notification control is enabled
2012-01-24 17:08:53 +05:30
Rushabh Mehta
17a8a3697d
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-01-24 15:16:34 +05:30
Rushabh Mehta
5b9270981c
added css:
2012-01-24 15:16:06 +05:30
Anand Doshi
6be842f960
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-01-24 14:58:41 +05:30
Anand Doshi
a2c9e39ca3
Merge branch 'master' into latest
...
Conflicts:
index.html
version.num
2012-01-24 14:58:24 +05:30
Anand Doshi
f51e52c1be
Fix in subject issue of support ticket
2012-01-24 14:56:20 +05:30
Rushabh Mehta
7cca292494
version
2012-01-24 14:34:27 +05:30
Rushabh Mehta
865c00a79a
started website
2012-01-24 14:33:21 +05:30
Anand Doshi
a2fcca578d
Purchase Other Charges - company field
2012-01-24 13:46:46 +05:30
Anand Doshi
2e3ce6cc02
Fix error in patch due to single quote in name
2012-01-24 11:37:28 +05:30
Anand Doshi
3c572d7468
change patch file in patch list customer address contact patch
2012-01-24 10:55:04 +05:30
Anand Doshi
568ab004ad
Merge branch 'latest' of github.com:webnotes/erpnext into latest
...
Conflicts:
index.html
version.num
2012-01-23 18:41:33 +05:30
Anand Doshi
590be7e643
Merge branch 'master' into latest
...
Conflicts:
index.html
version.num
2012-01-23 18:37:09 +05:30
Anand Doshi
706baf77ae
customer address contact patch
2012-01-23 18:35:28 +05:30
Anand Doshi
9a7ea9285e
Customer Address Contact report
2012-01-23 18:32:20 +05:30
Anand Doshi
7daed0cad7
Merge branch 'master' into stable
2012-01-23 18:13:58 +05:30
Rushabh Mehta
1061b4a7ea
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-01-23 16:18:53 +05:30
Rushabh Mehta
c5bf642c7d
version
2012-01-23 16:18:34 +05:30
Anand Doshi
4d22ce96d1
Fix: is_default of BOM
2012-01-23 14:51:00 +05:30
Anand Doshi
cfdd827a84
Merge branch 'master' into latest
2012-01-23 14:09:50 +05:30
Anand Doshi
a170418ed0
Fixes in floating point issues
2012-01-23 14:09:06 +05:30
Anand Doshi
0529bc1e53
Doc's name in subject of auto notifications
2012-01-23 10:54:53 +05:30
Rushabh Mehta
843db59fcb
version fixes
2012-01-20 17:43:37 +05:30
Rushabh Mehta
49ebfb6a30
version
2012-01-20 15:32:18 +05:30
Anand Doshi
6840ef67df
Merge branch 'stable' into latest
2012-01-20 15:03:23 +05:30
Anand Doshi
da68ce8b84
Fix to other charges total
2012-01-20 15:02:41 +05:30
Anand Doshi
af4b0a9e90
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-01-20 14:50:45 +05:30
Anand Doshi
12b1db4e8a
Merge branch 'stable' into latest
2012-01-20 14:50:15 +05:30
Anand Doshi
60c42d2e1c
Fix to other charges total
2012-01-20 14:44:14 +05:30
Anand Doshi
4c92390972
Fix to other charges total
2012-01-20 14:32:01 +05:30
Anand Doshi
10393b39d3
Other Charges total fixed to 2 decimals
2012-01-20 14:29:40 +05:30
Rushabh Mehta
c071af73e2
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-01-20 13:51:44 +05:30
Rushabh Mehta
8c309bee53
bootstrap toolbar
2012-01-20 13:47:16 +05:30
Anand Doshi
821b6544f8
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-01-20 13:23:37 +05:30
Anand Doshi
42907ffb43
Merge branch 'stable' into latest
2012-01-20 13:23:04 +05:30
Anand Doshi
ff54778418
Fix in sales_common
2012-01-20 13:20:21 +05:30
Rushabh Mehta
764fdb942e
updated account url and js version
2012-01-20 12:07:56 +05:30
Rushabh Mehta
b7d831b734
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-01-20 10:53:35 +05:30
Rushabh Mehta
0a5657809a
fixes to add user
2012-01-20 10:52:53 +05:30
Anand Doshi
869c7bcbb2
Validate if another GRN exists having same supplier and challan no. - then throw exception
2012-01-19 18:31:21 +05:30
Anand Doshi
8c36f47ea6
Merge branch 'latest' of github.com:webnotes/erpnext into latest
2012-01-19 17:13:43 +05:30
Anand Doshi
6c7e54d373
Merge branch 'master' into latest
2012-01-19 17:13:05 +05:30
Anand Doshi
edb45c6ce5
Purchase Rcpt in Feed, Grand Total fixed to 2 decimals in sales_common.js
2012-01-19 17:12:17 +05:30
Rushabh Mehta
f2c4c4231f
minor bugfixes
2012-01-19 11:43:34 +01:00
Rushabh Mehta
3a32478db9
confict fix
2012-01-19 15:11:07 +05:30
Rushabh Mehta
d31bf62c9a
fixed patches, small bugs
2012-01-19 15:09:49 +05:30
Anand Doshi
20274a0069
Merge branch 'master' into latest
2012-01-19 15:00:56 +05:30
Anand Doshi
39eff71864
remove get tds button
2012-01-19 14:57:23 +05:30
Anand Doshi
28ac0b0c88
Merge branch 'master' into latest
...
Conflicts:
erpnext/patches/patch_list.py
2012-01-19 14:31:03 +05:30
Anand Doshi
26814e7bad
Remove Get TDS button, which appears twice in JV
2012-01-19 14:26:25 +05:30
Anand Doshi
ad2f5d1270
Merge branch 'stable'
2012-01-19 12:42:11 +05:30
Anand Doshi
f343a8bc75
remove extra buttons labelled Make Maintenance Visit
2012-01-19 12:41:54 +05:30
Anand Doshi
4b0b4a7fdc
Merge branch 'stable'
...
Conflicts:
erpnext/patches/patch_list.py
2012-01-19 12:35:54 +05:30
Anand Doshi
b5bc54dd00
Merge branch 'stable' into latest
...
Conflicts:
erpnext/patches/patch_list.py
2012-01-19 12:34:30 +05:30
Anand Doshi
5f72836f11
Patch to change allocated_to options to 'Profile'
2012-01-19 12:32:15 +05:30
Anand Doshi
06c1050863
Merge branch 'master' into latest
2012-01-19 11:51:28 +05:30
Anand Doshi
367357fafd
utf-8 encode response message while sending email response message
2012-01-19 11:48:43 +05:30
Anand Doshi
d94d1c6dff
Merge branch 'master' into latest
2012-01-19 11:38:23 +05:30
Anand Doshi
32fd59b3ff
resolved utf-8 issue in 'In Reply To' part of support ticket response
2012-01-19 11:37:32 +05:30
Anand Doshi
a7d632db99
Merge branch 'latest' of github.com:webnotes/erpnext into latest
...
Conflicts:
index.html
version.num
2012-01-18 12:33:16 +05:30
Anand Doshi
165fe9e122
Merge branch 'stable' into latest
2012-01-18 12:31:51 +05:30
Anand Doshi
2cb3cef064
Merge branch 'stable'
2012-01-18 12:31:32 +05:30
Anand Doshi
890aa0f51d
fix: interface error due to use of sql instead of webnotes.conn.sql
2012-01-18 12:25:20 +05:30
Rushabh Mehta
94b88b9e22
added patch for subdomain
2012-01-18 10:55:39 +05:30
Rushabh Mehta
0a29975bfe
fixed conflicts
2012-01-18 10:54:55 +05:30
Rushabh Mehta
88ba7b86dc
fixes to login check
2012-01-18 06:18:52 +01:00
Anand Doshi
d3a23b5e8c
Item Manufacturer/Supplier Details in item doctype
2012-01-17 18:46:43 +05:30
Rushabh Mehta
bedc1fe534
new login authentication
2012-01-17 18:17:06 +05:30
Anand Doshi
16c4e72199
Merge branch 'stable' into latest
2012-01-17 14:25:30 +05:30
Anand Doshi
97bd3663f2
Show full name in contact_display
2012-01-17 14:22:09 +05:30
Anand Doshi
34561e73dd
Merge branch 'stable' into latest
2012-01-16 17:53:45 +05:30
Anand Doshi
a0b1948261
Support Ticket - In response to fix
2012-01-16 17:52:15 +05:30
Anand Doshi
dc914276a9
Merge branch 'master' into latest
2012-01-16 17:39:33 +05:30
Anand Doshi
a9023b1787
Merge branch 'stable'
2012-01-16 17:39:10 +05:30
Anand Doshi
fd0373826b
Merge branch 'stable' of github.com:webnotes/erpnext into stable
2012-01-16 17:38:47 +05:30
Anand Doshi
d487f782a4
Fix: change module name from material_management to stock in an import in installation_note
2012-01-16 17:38:19 +05:30
Anand Doshi
077416300e
Fix: floating point issue on submission of RV and creation of GL Entry
2012-01-16 16:02:47 +05:30
Rushabh Mehta
b3672784be
support ticket goes with response
2012-01-16 14:27:43 +05:30
Anand Doshi
90f6e55c29
Changes in Inclusive Rate Taxes precision
2012-01-16 14:13:39 +05:30
Rushabh Mehta
cb60ca13a9
added patch to convert tables to utf8
2012-01-16 11:58:14 +05:30
Anand Doshi
1acf3f4de5
Merge branch 'stable'
2012-01-13 17:43:46 +05:30
Anand Doshi
610f9728ab
Removing ref_rate back calculation as it injects floating point issue
2012-01-13 17:43:22 +05:30
Anand Doshi
8241e9a2ce
Merge branch 'stable'
2012-01-13 15:54:01 +05:30
Anand Doshi
a318235a1f
Fix: Paid amount + Write Off Amount and grand total difference calculation with 2 decimal precision
2012-01-13 15:53:46 +05:30
Anand Doshi
e5b60884d0
Merge branch 'stable'
2012-01-13 15:46:17 +05:30
Anand Doshi
4badeecf36
Reverting toFixed issue for grand total
2012-01-13 15:45:58 +05:30
Anand Doshi
98660b5d5a
Merge branch 'stable'
2012-01-13 14:36:09 +05:30
Anand Doshi
560883145c
Fix to floating point issue in grand total
2012-01-13 14:35:42 +05:30
Anand Doshi
ada0b5d554
Merge branch 'stable'
2012-01-13 13:24:53 +05:30
Anand Doshi
7b96d1f300
search_criteria patch
2012-01-13 11:53:22 +05:30
Anand Doshi
4b80a81a2e
Rename Search Criteria Patch
2012-01-13 11:14:29 +05:30
Anand Doshi
d2b8072805
Merge branch 'stable'
2012-01-12 15:13:59 +05:30
Anand Doshi
265f3edb8f
On clicking Get Charges, also pull the field included_in_print_rate
2012-01-12 14:56:26 +05:30
Anand Doshi
d03efeaf00
Fixed UX issue in change user password by system manager
2012-01-12 14:50:51 +05:30
Anand Doshi
29c5676467
Merge branch 'stable'
2012-01-12 13:47:22 +05:30
Anand Doshi
cb1f361461
Fix: Notify via email on new post on my company page
2012-01-12 13:46:46 +05:30
Anand Doshi
640955f91d
Patch for fixes after major production rewrite
2012-01-12 12:55:29 +05:30
Anand Doshi
2bc9423cd1
Fix: Backflush issue due to missing BOM
2012-01-12 12:32:13 +05:30
Nabin Hait
c95bad917b
open sales order query changes: pull only those which are pending to deliver
2012-01-11 18:28:43 +05:30
Nabin Hait
d3db58d6b4
Pull only SO which has production/subcontracted item
2012-01-11 17:48:09 +05:30
Nabin Hait
8389e7aad1
Description changed in pro order
2012-01-11 17:37:06 +05:30
Nabin Hait
a8077bdd20
Error fixed in patch
2012-01-11 17:22:54 +05:30
Nabin Hait
ce3ecf00c2
Removed msgprint from bom control
2012-01-11 17:17:47 +05:30
Nabin Hait
8be5017048
Merge branch 'master' of github.com:webnotes/erpnext
2012-01-11 16:58:01 +05:30
Nabin Hait
42a411398a
Error fixed in patches
2012-01-11 16:57:44 +05:30
Anand Doshi
a550c06729
last_name optional in profile settings
2012-01-11 16:53:50 +05:30
Nabin Hait
55c037c250
Added production_cleanup patch
2012-01-11 16:44:07 +05:30
Nabin Hait
c5d6bcbb8f
Production module cleanup
2012-01-11 16:41:16 +05:30
Anand Doshi
06d43bcfe2
Fix: Rounded Total appearing extra in Standard Print Format
2012-01-11 15:05:24 +05:30
Anand Doshi
58574acfbc
Fix: Bug in Actual Tax Rate due to inclusive rate
2012-01-11 13:39:06 +05:30
Anand Doshi
a8c2f59d1b
Escape (') in customer name in authorization control
2012-01-11 12:07:48 +05:30
Anand Doshi
385299903d
Escape (') in customer name in authorization control
2012-01-11 12:03:47 +05:30
Anand Doshi
35041607be
Fix: when ref_rate is 0 and basic_rate is > 0, calc ref_rate
2012-01-11 11:21:58 +05:30
Anand Doshi
9896452903
txt dump of DocType Label Indent and Module Def Buying
2012-01-10 17:58:07 +05:30
Anand Doshi
bf166e487d
Patch to rename doctype indent
2012-01-10 17:06:16 +05:30
Anand Doshi
3a82dfd171
Rename Indent to Purchase Requisition
2012-01-10 16:56:11 +05:30
Anand Doshi
bc45f896f7
Merged master with stable
2012-01-10 14:11:07 +05:30
Anand Doshi
266829f024
Merge branch 'master' into stable
2012-01-10 13:59:14 +05:30
Anand Doshi
a0aa3d5605
Merge branch 'master' of github.com:webnotes/erpnext
2012-01-10 13:59:04 +05:30
Anand Doshi
95c9d30cfd
Removed unnecessary console logs
2012-01-10 11:52:43 +05:30
Anand Doshi
a9df960494
On Print Hide, hide net_total, rounded_total_export and grand_total_export
2012-01-09 16:55:30 +05:30
Nabin Hait
40de49110e
Removed webforms link from setup
2012-01-09 12:54:20 +05:30
Anand Doshi
07d8570c80
Make Profile Last Name optional in profile settings
2012-01-06 18:14:42 +05:30
Anand Doshi
a31fd1080b
Change in top toolbar. It will not include profile link. The home right sidebar will have the profile settings link
2012-01-06 16:27:54 +05:30
Anand Doshi
58455c9d8e
Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed
2012-01-06 14:33:57 +05:30
Anand Doshi
4a1da119f9
Refresh support ticket status when a new reply is received
2012-01-06 12:58:23 +05:30
Anand Doshi
7f16efe35d
Refresh issue fixed for support ticket
2012-01-06 12:06:29 +05:30
Anand Doshi
7a87c7de46
Trying to fix support ticket refresh issue
2012-01-06 12:02:50 +05:30
Anand Doshi
449f534c36
Trying to fix support ticket refresh on reply issue
2012-01-06 11:54:21 +05:30
Anand Doshi
6a13e8b645
Apply naming series when saving support ticket for 1st time
2012-01-05 19:17:57 +05:30
Nabin Hait
fb5df36c38
event notificationin maintenance schedule
2012-01-05 18:37:27 +05:30
Nabin Hait
84745e7ac1
event notificationin maintenance schedule
2012-01-05 18:03:16 +05:30
Anand Doshi
9dd1e5d728
Support Ticket Naming Series
2012-01-05 17:39:42 +05:30
Anand Doshi
97b1bf4b19
Fixed support ticket issue
2012-01-05 15:46:47 +05:30
Anand Doshi
dc64802e96
Fix Support Ticket
2012-01-05 15:19:00 +05:30
Anand Doshi
523f3a0ea2
Added Administrator to exception list of users to be logged out post login
2012-01-05 14:34:30 +05:30
Nabin Hait
a9cca2e2e9
error fixed in reorder indent
2012-01-05 14:10:14 +05:30
Nabin Hait
8fb9abd47e
Subject added in notification mail
2012-01-05 14:01:35 +05:30
Anand Doshi
9dfc9f617b
Fix regarding support ticket to support ticket system email chaining issue
2012-01-05 13:54:29 +05:30
Nabin Hait
b50c02214c
removed pur of service
2012-01-05 12:21:03 +05:30
Nabin Hait
7394239e05
delete purpose of service
2012-01-05 12:16:28 +05:30
Nabin Hait
2abc6026f2
reload po-pr mapper
2012-01-05 11:24:49 +05:30
Nabin Hait
d2686b1c31
reload doctype
2012-01-05 11:16:18 +05:30
Anand Doshi
5e57a39bb1
Merge branch 'master' into stable
2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480
Changes in Notifications
2012-01-04 19:31:32 +05:30
Nabin Hait
15e8277a46
Dont update series starts from if no prefix
2012-01-04 16:23:09 +05:30
Nabin Hait
9d8e85c1f5
Dont update series starts from if no prefix
2012-01-04 16:17:18 +05:30
Anand Doshi
a6272af68a
Fix to logout previous session on login
2012-01-03 17:02:20 +05:30
Anand Doshi
b63a007c91
Fixed logout issue
2012-01-03 16:11:04 +05:30
Anand Doshi
d34ff76526
Fixed logout issues
2012-01-03 16:00:03 +05:30
Anand Doshi
6ac1d4bb44
Merge branch 'stable' of github.com:webnotes/erpnext into stable
...
Conflicts:
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
2012-01-03 11:45:11 +05:30
Anand Doshi
9fdee387ea
Allow demo user to have multiple sessions
2012-01-03 11:26:00 +05:30
Nabin Hait
616548f95c
Merge branch 'master' of github.com:webnotes/erpnext
2012-01-03 11:10:25 +05:30
Nabin Hait
db126e80b8
pos setting patch
2012-01-03 11:10:11 +05:30
Anand Doshi
d56d57d205
Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login
2012-01-02 16:25:05 +05:30
Anand Doshi
1e4b8be8dc
Merge pull request #194 from anandpdoshi/master
...
Posting comments to other users now working
2012-01-02 02:31:30 -08:00
Anand Doshi
1fad05aed8
Bug Fix: Posting comments to other users now working
2012-01-02 16:00:15 +05:30
Anand Doshi
62dbf27780
Merge pull request #192 from anandpdoshi/master
...
New transaction entries fix for email digest
2011-12-30 02:33:05 -08:00
Anand Doshi
34b9f5b1e0
Fix new transaction entries issue
2011-12-30 16:02:03 +05:30
Nabin Hait
c184dc56a4
Error fixed in uom conversion rate fetching
2011-12-30 13:29:45 +05:30
Nabin Hait
a21156d4d3
Removed msgprint
2011-12-30 11:16:15 +05:30
Nabin Hait
21d0b68a7d
Fixes in pending_patches
2011-12-29 15:39:26 +05:30
Nabin Hait
0dfb8e939c
Pending patches to be run from patch.py
2011-12-29 14:40:05 +05:30
Nabin Hait
48285ede08
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-29 12:57:31 +05:30
Nabin Hait
6182b929bf
set default value as blank insead of None through manage account
2011-12-29 12:56:55 +05:30
Anand Doshi
10748d6bdb
Merge pull request #190 from anandpdoshi/master
...
Changed link for customer master and supplier master in accounts browser
2011-12-28 03:49:13 -08:00
Anand Doshi
eaa6d21691
Changed link for customer master and supplier master in accounts browser
2011-12-28 17:18:09 +05:30
Nabin Hait
9e08c12a10
Default price list currency issue in delivery note fixed
2011-12-28 16:30:48 +05:30
Anand Doshi
7a4d9dbd3e
Fixes in support ticket attachments
2011-12-27 19:40:10 +05:30
Anand Doshi
c50f605450
Enabled Attachments in Support Ticket
2011-12-27 17:44:30 +05:30
Anand Doshi
08eff708bf
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-27 17:24:19 +05:30
Anand Doshi
20f0d305cb
Allow attachments in support ticket
2011-12-27 17:09:55 +05:30
Nabin Hait
4febc84f13
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-27 16:42:27 +05:30
Nabin Hait
3029474b0e
Fixes in recurring invoice
2011-12-27 16:42:03 +05:30
Nijil Y
04eb52dbe3
added fields
2011-12-26 15:30:45 +05:30
Nijil Y
68de3687f4
added fields
2011-12-26 15:24:55 +05:30
Nabin Hait
3f7d7077f0
Merge pull request #183 from nijil/master
...
allignment and error fix
2011-12-25 23:13:05 -08:00
Nabin Hait
a0778fec61
Reload gl mapper patches
2011-12-26 12:28:14 +05:30
Nijil Y
2a59030e05
task notification fix
2011-12-26 12:00:30 +05:30
Nabin Hait
16aacdfeeb
Error fixed in ticket
2011-12-26 11:37:52 +05:30
Nabin Hait
cf0163d09e
Patch updated
2011-12-26 11:13:49 +05:30
Nabin Hait
f7e1569207
ticket.py modified
2011-12-26 11:08:55 +05:30
Nabin Hait
a0286e986e
patch updated
2011-12-26 11:08:32 +05:30
Nabin Hait
40deced91c
Merge pull request #180 from nijil/master
...
Task Notification
2011-12-25 21:24:33 -08:00
Nabin Hait
56f7ccbe70
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-23 18:26:34 +05:30
Nabin Hait
c6359a9179
Patch to update against_voucher in gle for jv aganst jv
2011-12-23 18:26:17 +05:30
Nabin Hait
382dc6e819
GL Mapper changes for JV
2011-12-23 18:25:11 +05:30
Nijil Y
a4e8d1e983
.
2011-12-23 18:01:40 +05:30
Nijil Y
0cfecf2920
email message fix for task
2011-12-23 17:54:07 +05:30
Nijil Y
0de918204d
Merge branch 'master' of git://github.com/webnotes/erpnext
2011-12-23 17:35:39 +05:30
Nijil Y
cc64682baa
fixed
2011-12-23 17:35:18 +05:30
Nijil Y
89e5624730
Update erpnext/projects/doctype/ticket/ticket.py
2011-12-23 16:21:51 +05:30
Nijil Y
9239afa222
Update erpnext/projects/doctype/ticket/ticket.py
2011-12-23 16:18:49 +05:30
Nijil Y
cc0e502d0f
scheduler
2011-12-23 15:08:43 +05:30
Anand Doshi
8d53f7635a
Merge pull request #179 from anandpdoshi/master
...
Changes in Permission Manager to exclude doctype of 'Core' module and also mark Profile as not in create
2011-12-23 00:21:53 -08:00
Anand Doshi
ac20eb2107
Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create
2011-12-23 13:50:28 +05:30
Nijil Y
4d64379aa6
scheduler added to project control for reminder
2011-12-23 12:32:08 +05:30
Nijil Y
b8eab4f2da
Merge branch 'master' of git://github.com/webnotes/erpnext
2011-12-23 12:19:46 +05:30
Nijil Y
f1e98b9d8b
Scheduler added for reminder notification - which will be sent 2 days before the task begins
2011-12-23 12:01:31 +05:30
Anand Doshi
d9fc4c07c9
Merge pull request #178 from anandpdoshi/master
...
Fix: Email digest gets deleted if even one is disabled
2011-12-22 22:27:47 -08:00
Anand Doshi
bd269cdbe7
Fix: Email digest gets deleted if even one is disabled.
2011-12-23 11:55:00 +05:30
Nabin Hait
e80496cef4
Consider description also to check item duplication in purchase cycle
2011-12-23 11:25:37 +05:30
Nabin Hait
e323ef20b0
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-22 19:05:08 +05:30
Nabin Hait
d0a892ffe7
print hide price list flds
2011-12-22 19:04:49 +05:30
Anand Doshi
f5d5f10ff3
Remove "Add Recipients" button from Email Digest (again!)
2011-12-22 19:02:15 +05:30
Anand Doshi
4714424de0
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-22 18:22:46 +05:30
Anand Doshi
0188df1609
Amended the patch to import class Document
2011-12-22 18:21:57 +05:30
Anand Doshi
27b05eac7a
Merge pull request #176 from anandpdoshi/master
...
Patch to enable income year to date summary in email digest
2011-12-22 04:48:57 -08:00
Anand Doshi
68f3967de0
Patch to enable income year to date summary in email digest
2011-12-22 18:18:10 +05:30
Anand Doshi
a4db9e9b5a
Merge pull request #175 from anandpdoshi/master
...
Added feature: Income Year To Date in Email Digest
2011-12-22 04:33:35 -08:00
Anand Doshi
61a4a498cf
Added feature: Income Year To Date in Email Digest
2011-12-22 18:02:36 +05:30
Nijil Y
f2a5c290b3
Merge branch 'master' of git://github.com/webnotes/erpnext
2011-12-22 17:43:46 +05:30
Nijil Y
b3058a3d5a
Task Notification donw, reminder left
2011-12-22 17:39:18 +05:30
Anand Doshi
6d0be02364
Merge pull request #174 from anandpdoshi/master
...
Fixed issue: If account of type "Bank or Cash" is not associated to a GL Entry, then it displays an alert in the email digest email body
2011-12-22 04:06:35 -08:00
Anand Doshi
94a18109d7
Fixed issue: If account of type "Bank or Cash" is not associated to any GL Entry, then it displays an alert in the email digest email body
2011-12-22 17:34:11 +05:30
Anand Doshi
3ca92bb3e4
Merge pull request #173 from anandpdoshi/master
...
Dont show bank balance if no ledger of type "Bank or Cash"
2011-12-22 03:54:48 -08:00
Anand Doshi
7792d08408
Dont show bank balance if no ledger of type "Bank or Cash"
2011-12-22 17:23:11 +05:30
Anand Doshi
99479bdb7f
Merge pull request #172 from anandpdoshi/master
...
remove previous field property setter
2011-12-22 01:50:07 -08:00
Anand Doshi
f2f4c87bb6
remove previous field property setter
2011-12-22 15:19:16 +05:30
Anand Doshi
d1bfe839fa
Merge pull request #171 from anandpdoshi/master
...
Patch to update idx which starts with 0
2011-12-22 01:37:04 -08:00
Anand Doshi
9ca7e5255b
Patch to update idx.. start idx from 1
2011-12-22 15:05:14 +05:30
Nijil Y
8acb043a8a
update
2011-12-22 13:08:25 +05:30
Nabin Hait
7e812bbee0
Error fixed in patch
2011-12-22 12:58:34 +05:30
Nabin Hait
6998261a7e
Error fixed in auto indent patches
2011-12-22 12:56:57 +05:30
Nabin Hait
20c87531cb
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-22 12:54:39 +05:30
Nabin Hait
9e8249fea1
Error fixed in bin
2011-12-22 12:54:13 +05:30
Anand Doshi
5a32f78bf3
Merge pull request #170 from anandpdoshi/master
...
calls on_update method of email_digest obj for creating a scheduler entry
2011-12-21 22:59:31 -08:00
Anand Doshi
248f8f5687
Update on previous commit: calls on_update method of email_digest obj for creating a scheduler entry
2011-12-22 12:26:36 +05:30
Anand Doshi
c9b2743e1c
Merge pull request #168 from anandpdoshi/master
...
Fix Image attachments and Enable Email Digests
2011-12-21 22:45:13 -08:00
Anand Doshi
972b165850
Modified deploy_email_digest to enable all the default email digests
2011-12-22 12:04:28 +05:30
Nabin Hait
b9e8a41cd2
Account and cost center get_query changes for other charges table
2011-12-21 17:33:57 +05:30
Nijil Y
36f58835e6
Update erpnext/patches/auto_indent.py
2011-12-21 16:35:43 +05:30
Nijil Y
c62953579d
fix
2011-12-21 16:32:42 +05:30
Nijil Y
f800dc02f1
fix
2011-12-21 16:20:39 +05:30
Anand Doshi
c111803a4a
Fixed image attachment in profile settings
2011-12-21 14:55:14 +05:30
Nijil Y
07b03fbe09
Merge branch 'master' of github.com:nijil/erpnext
2011-12-21 14:54:34 +05:30
Nijil Y
9e6f00abab
fixes for notification
2011-12-21 14:54:14 +05:30
Nijil Y
b36bebe9f0
Update erpnext/stock/doctype/bin/bin.py
2011-12-21 14:53:04 +05:30
Nijil Y
2c19960996
account conflict
2011-12-21 13:30:09 +05:30
Nabin Hait
da9e2e6898
Company master link in global defaults
2011-12-21 13:24:10 +05:30
Nijil Y
9b6fc0f83d
Merge branch 'master' of github.com:nijil/erpnext
2011-12-21 13:24:02 +05:30
Nabin Hait
520de0529f
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-21 12:51:38 +05:30
Nijil Y
0f9eaeaa3c
updation Merge branch 'master' of git://github.com/webnotes/erpnext
...
Conflicts:
erpnext/projects/doctype/ticket/ticket.py
2011-12-21 12:34:13 +05:30
Nijil Y
16ca593bbf
Update erpnext/patches/auto_indent.py
2011-12-21 12:20:07 +05:30
Nijil Y
4d6a71c5f2
Update erpnext/patches/auto_indent.py
2011-12-21 11:56:42 +05:30
Nijil Y
35aa35bea3
Update erpnext/patches/auto_indent.py
2011-12-21 11:50:20 +05:30
Nabin Hait
53ef4009ba
Fixes in patches
2011-12-21 11:22:32 +05:30
Nijil Y
205e042113
patch file
2011-12-20 21:14:43 +05:30
Nijil Y
dc0461296d
Email Notification for Tasks
2011-12-20 21:13:58 +05:30
Anand Doshi
146f47faab
Merge pull request #167 from anandpdoshi/master
...
Patch to remove extra button from Email Digest Form
2011-12-20 05:40:59 -08:00
Nabin Hait
63b94c42e4
Price list patch
2011-12-20 19:09:23 +05:30
Nabin Hait
60fc54a9ba
Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form
2011-12-20 18:59:26 +05:30
Nabin Hait
7c03cfad6a
Default Price List Currency fld added in Global Defaults
2011-12-20 18:50:41 +05:30
Nabin Hait
a57732f71d
Removed custom field from doctype
2011-12-20 18:48:19 +05:30
Anand Doshi
6a605b47ef
Patch to remove 'Add Recipients' button from Email Digest form
2011-12-20 18:31:57 +05:30
Nijil Y
04da8741c3
fix
2011-12-20 18:09:43 +05:30
Nijil Y
d82e8df7e5
patch update for auto indent with email notify
2011-12-20 17:30:41 +05:30
Nijil Y
8dd861bda5
Auto Indent creation when stock reaches re-order level
2011-12-20 17:17:51 +05:30
Nabin Hait
74fcb69b13
Error fixed in cust group
2011-12-20 11:48:27 +05:30
Nabin Hait
b8cec492c5
Fixed issue in c-form patch
2011-12-16 16:48:17 +05:30
Nabin Hait
488bcc8700
reload_employeewise_balance_leave_report patch updated
2011-12-16 16:29:31 +05:30
Nabin Hait
e3daffe477
reload_employeewise_balance_leave_report
2011-12-16 16:28:26 +05:30
Nabin Hait
3bfeefafcd
Modified patch
2011-12-16 16:19:38 +05:30
Nabin Hait
f8bfcdc495
Modified patch
2011-12-16 16:15:31 +05:30
Nabin Hait
c57c5b0b44
Return if old patch.py executed anyway
2011-12-16 10:17:26 +05:30
Nabin Hait
b2150de64b
Freezing Error fixed in purchase invoice
2011-12-15 16:29:04 +05:30
Nabin Hait
9a0d05d354
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-15 15:48:51 +05:30
Nabin Hait
6e9a1284d4
remove depricated default fileds
2011-12-15 15:48:18 +05:30
Anand Doshi
490d298fa0
patch to remove old control panel email settings
2011-12-15 15:46:31 +05:30
Anand Doshi
ca39b180f5
patch to remove old control panel email settings
2011-12-15 15:40:15 +05:30
Anand Doshi
48d8d36b79
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-15 14:28:02 +05:30
Anand Doshi
7f18dd3b94
Patches for email digest and remove page break from defaults
2011-12-15 14:24:55 +05:30
Nabin Hait
b3081fafb6
Merge pull request #160 from nijil/master
...
Accounts Default Form Fix
2011-12-14 22:28:52 -08:00
Anand Doshi
a51aefbced
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-14 20:36:11 +05:30
Anand Doshi
21c649527a
Provides better error message to the user
2011-12-14 20:35:19 +05:30
Anand Doshi
407ebb9e41
Merge pull request #161 from anandpdoshi/master
...
Resolved bug: when account of type 'Bank or Cash' does not exists
2011-12-14 06:36:32 -08:00
Anand Doshi
e7982f0f85
Merge branch 'master' of github.com:anandpdoshi/erpnext
...
Conflicts:
erpnext/setup/doctype/email_digest/email_digest.py
2011-12-14 20:05:16 +05:30
Anand Doshi
ddf4c2655d
Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception
2011-12-14 20:04:04 +05:30
Anand Doshi
3fe9795020
Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception
2011-12-14 20:00:55 +05:30
Nabin Hait
44bba97dc9
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-14 18:09:39 +05:30
Nabin Hait
b93ea233ff
Error fixed in task
2011-12-14 18:09:13 +05:30
Anand Doshi
c2a9cca4fd
Change in add user dialog box:
...
Now it includes First Name, Last Name and Password field
if run as a standalone app
2011-12-14 17:12:12 +05:30
Anand Doshi
ad42e558df
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-14 16:10:44 +05:30
Anand Doshi
ed73fb2b26
Fixed bug regarding setting of banner
2011-12-14 16:09:59 +05:30
Nijil Y
b40f826c5a
.
2011-12-14 15:50:09 +05:30
Nijil Y
d18153e413
Account Default settings form fix
2011-12-14 15:28:51 +05:30
Anand Doshi
e47be26682
Merge pull request #159 from anandpdoshi/master
...
Commented print statement in email_digest.py
2011-12-13 23:07:30 -08:00
Anand Doshi
8875d91a8e
Commented print statement while inserting record in scheduler
2011-12-14 12:35:07 +05:30
Nabin Hait
9e4d5b9649
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-14 11:27:50 +05:30
Nabin Hait
3a2fcba15f
Purchase Discount option in Features Setup
2011-12-14 11:26:46 +05:30
Nabin Hait
f21ceb283c
Arranged field order in item table
2011-12-14 11:26:05 +05:30
Nabin Hait
dcac0e7565
Merge pull request #156 from anandpdoshi/master
...
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
2011-12-13 05:37:41 -08:00
Nabin Hait
536e0cb1c4
fixes in patch
2011-12-13 19:05:13 +05:30
Nabin Hait
08d803791d
Merge branch 'master' of git://github.com/nijil/erpnext
2011-12-13 18:49:59 +05:30
Nabin Hait
85e8e01fd6
notification email for recurring invoice
2011-12-13 18:48:24 +05:30
Nijil Y
f6a3441d99
patch
2011-12-13 18:31:42 +05:30
Nijil Y
8fb260504a
purchase discount
2011-12-13 18:14:15 +05:30
Anand Doshi
f5ff4434df
Patch to reload Task doctype of Projects Module
2011-12-13 18:13:23 +05:30
Anand Doshi
206df20f36
Changes in print formats to include selected print heading and discount
...
appended in description
2011-12-13 15:57:09 +05:30
Anand Doshi
130ae98675
Changes in dashboard start date and end date default logic such that the
...
conditions for fiscal year range are met
2011-12-12 20:24:06 +05:30
Anand Doshi
3a23a5740e
In Dashboard, display a customer friendly error message when the start and end dates
...
are not within a fiscal year
2011-12-12 19:50:09 +05:30
Anand Doshi
5245e6547b
Change path of images in accounts browser and sales browser
2011-12-12 19:18:23 +05:30
Nabin Hait
8a6b3b8713
Validation added in c-form
2011-12-12 14:16:16 +05:30
Anand Doshi
deb816d30c
Patch to remove duplicate entries created due to change in
...
validation_logic in Table Mapper Detail for the following doctypes:
* Delivery Note-Receivable Voucher
* Purchase Order-Purchase Voucher
* Sales Order-Receivable Voucher
2011-12-12 12:41:36 +05:30
Nijil Y
fdc7fc62a5
payable voucher.js
2011-12-12 10:50:18 +05:30
Nijil Y
b54d7282a7
pvdetail
2011-12-12 10:31:23 +05:30
Anand Doshi
17c1a7d9ed
Merge branch 'master' of github.com:webnotes/erpnext into edigest
2011-12-08 19:36:54 +05:30
Anand Doshi
fb3c3fb064
Merge branch 'master' of github.com:anandpdoshi/erpnext into edigest
2011-12-08 19:36:29 +05:30
Anand Doshi
633edbef46
Email Digest - ready to be deployed
2011-12-08 19:34:01 +05:30
Nijil Y
38821f6104
txt order update
2011-12-08 18:32:58 +05:30
Nabin Hait
7e44f9789b
Patch for c-form
2011-12-08 18:07:20 +05:30
Nabin Hait
2577e2ae27
Patch for c-form
2011-12-08 18:06:53 +05:30
Nabin Hait
fd20340576
Introduced C-form for Indian customer
2011-12-08 17:49:40 +05:30
Nijil Y
edf8bc2a3e
Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
...
Conflicts:
erpnext/accounts/doctype/pv_detail/pv_detail.txt
erpnext/buying/doctype/po_detail/po_detail.txt
erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
2011-12-08 17:29:24 +05:30
Nijil Y
add0c85648
Discount in purchase cycle
2011-12-08 16:53:12 +05:30
Nijil Y
d8e5bed9e5
Discount in purchase cycle
2011-12-08 16:09:18 +05:30
Nijil Y
4499851ceb
checking..
2011-12-08 14:14:11 +05:30
Nijil Y
630256f65b
purchase recipt detail
2011-12-08 13:01:43 +05:30
Nabin Hait
cde8bec0a6
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-06 19:05:14 +05:30
Nabin Hait
38d24534d7
Recurring invoice checkbox added in features setup
2011-12-06 19:04:21 +05:30
Anand Doshi
590448aaef
Changes in email digest
2011-12-06 18:51:14 +05:30
Nabin Hait
b28d6dc617
Repost stock patch
2011-12-06 15:11:14 +05:30
Nabin Hait
ea5f5ca57d
Recurring invoices patch
2011-12-06 15:10:48 +05:30
Nabin Hait
a4fdc84fda
Introduced recurring invoices
2011-12-06 15:04:47 +05:30
Anand Doshi
41e542ce4d
Email Digest changes
2011-12-06 10:41:54 +05:30
Anand Doshi
3f040a8f9e
Resolved bug Project creation:
...
Customer details not getting autofilled on customer selection
2011-12-05 12:17:51 +05:30
Anand Doshi
adf2f777d3
Removed print format option. Instead show html code.
2011-12-05 12:16:31 +05:30
Anand Doshi
393f5e6078
Queries to get new records in a particular doctype
2011-12-02 19:20:10 +05:30
Anand Doshi
f10ad98ebf
Refactored queries to be more clean
2011-12-02 17:53:08 +05:30
Anand Doshi
7057cbf9e5
Started with email digest
2011-12-02 15:15:38 +05:30
Anand Doshi
a27ae827c9
Merge branch 'master' of github.com:webnotes/erpnext
2011-11-30 15:25:19 +05:30
Anand Doshi
ed825062f1
Hide programming error messages from user on update_security
2011-11-30 15:23:37 +05:30
Nabin Hait
142af06d19
update serial no incoming rate through landing cost wizard
2011-11-25 16:37:21 +05:30
Nabin Hait
3aed35da0a
Merge branch 'master' of github.com:webnotes/erpnext
2011-11-25 14:43:39 +05:30
Nabin Hait
28b793c88a
incoming rate in serial no should be valuation rate instead of pur rate
2011-11-25 14:43:11 +05:30
Anand Doshi
8c10de6c1a
Modified patch to create a DocType Label record for DocLayer
2011-11-25 11:25:39 +05:30
Nijil
4e54d7a434
pvdetail and patch
2011-11-24 16:18:42 +05:30
Nijil
1530b93a6e
purchase recipt
2011-11-24 15:53:56 +05:30
Nijil
2f82c29348
..
2011-11-24 15:18:17 +05:30
Nijil
ba40bc93fe
payable voucher txt
2011-11-24 15:14:09 +05:30
Nijil
c37dad26d9
txt files
2011-11-24 15:07:54 +05:30
Nabin Hait
e92066fa80
modified fld prop in gl entry and index patch
2011-11-24 15:04:47 +05:30
Nabin Hait
a8be65aedf
Merge branch 'master' of github.com:webnotes/erpnext
2011-11-24 14:48:13 +05:30
Nabin Hait
d6ed0748a3
help content midified
2011-11-24 14:47:18 +05:30
Anand Doshi
956d665738
Merge pull request #148 from anandpdoshi/master
...
Modified GLEntry doctype to be not in create
2011-11-24 00:29:53 -08:00
Anand Doshi
be14e021b9
Reload GL Entry doctype
2011-11-24 13:57:46 +05:30
Anand Doshi
96e5343519
Marked GLEntry as Not In Create
2011-11-24 13:51:09 +05:30
Anand Doshi
6b8d0bfb2a
Added patch to reload doclayer, doclayer field and print format doctypes
2011-11-23 18:39:08 +05:30
Anand Doshi
6e5e30c420
Merge pull request #147 from anandpdoshi/master
...
Added Customize Form View and Print Formats to Setup Page
2011-11-23 04:35:20 -08:00
Anand Doshi
a04afc9b3b
Added Customize Form View (DocLayer) and Print Formats(docbrowser) to Setup Page
2011-11-23 13:51:52 +05:30
Nabin Hait
36427e577d
address filter flds
2011-11-23 13:21:21 +05:30
Nabin Hait
5f9ceb8dc8
filter property changed in address
2011-11-23 13:19:20 +05:30
Nabin Hait
ed6b489715
filter property changed in address
2011-11-23 13:17:54 +05:30
Nabin Hait
3addd27f2c
Address is added in setup for deleting purpose
2011-11-23 13:11:15 +05:30
Nabin Hait
816383056f
On deletion of warehouse, delete bin and sle if no qty
2011-11-23 12:58:03 +05:30
Nabin Hait
04176e62d8
fixed error in internal reco
2011-11-23 12:15:42 +05:30
Nijil
6800ad55bd
patch for Discount Rate
2011-11-22 15:21:42 +05:30
Nijil
54eb735a47
Added Discount in Purchase Cycle
2011-11-22 15:12:00 +05:30
Nabin Hait
2690e72c14
updated reco patch
2011-11-21 17:27:36 +05:30
Nabin Hait
38477a3616
patch for stock reconciliation
2011-11-21 17:16:48 +05:30
Nabin Hait
fc26f64011
rewritten stock reconciliation
2011-11-21 17:13:53 +05:30
Nijil
4491f01ce4
discount rate on purchase
2011-11-21 11:31:27 +05:30
Nijil
eb8233c779
Merge branch 'master' of git://github.com/webnotes/erpnext
2011-11-21 10:35:15 +05:30
Nijil
c7d64cf5a8
almost
2011-11-20 00:22:41 +05:30
Nijil
296c17b7ae
checking
2011-11-18 14:12:06 +05:30
Nabin Hait
8fa6ad90ed
sms sender name validation
2011-11-17 18:07:13 +05:30
Nabin Hait
26f74ed121
sms sender name validation
2011-11-17 18:03:10 +05:30
Nabin Hait
bc60c1f29c
fixed patch
2011-11-17 16:59:29 +05:30
Nabin Hait
92ec8d26eb
reload LC wizard
2011-11-17 15:03:05 +05:30
Nabin Hait
1a8831f476
reload LC wizard
2011-11-17 15:00:55 +05:30
Nabin Hait
a8da0fecb5
Account link query changed in LC wizard
2011-11-17 14:47:05 +05:30
Nabin Hait
f164b269db
Merge branch 'master' of github.com:webnotes/erpnext
2011-11-16 16:39:16 +05:30
Nabin Hait
9dd6330418
updated landed cost wizard
2011-11-16 16:38:55 +05:30
Nabin Hait
815a75f917
Rewritten landed cost wizard
2011-11-16 16:34:53 +05:30
Nabin Hait
b0fa2af45b
Rewritten landed cost wizard
2011-11-16 16:20:37 +05:30
Anand Doshi
bf41aef7f0
Merge pull request #144 from anandpdoshi/master
...
Changes in spartan print formats to show border in chrome
2011-11-16 01:20:33 -08:00
Anand Doshi
19a2767b77
Changes in spartan print formats to show border in chrome
2011-11-16 14:49:37 +05:30
Nabin Hait
7b095e97ad
Update erpnext/selling/doctype/quotation/quotation.py
2011-11-16 14:25:36 +05:30
Nabin Hait
efc2c327cf
Update erpnext/selling/doctype/quotation/quotation.py
2011-11-16 14:24:31 +05:30
Nabin Hait
4faf99424a
Modified validation for duplicate item
2011-11-16 14:20:45 +05:30
Nabin Hait
65a053abe6
Modified validation for duplicate item
2011-11-16 14:19:26 +05:30
Anand Doshi
0900756510
Merge pull request #143 from anandpdoshi/master
...
Changes in Sales Invoice Print Formats
2011-11-16 00:34:36 -08:00
Anand Doshi
9fe4331862
Changes in Sales Invoice Print Format
2011-11-16 14:03:52 +05:30
Anand Doshi
96fd8bec9b
Changes in Sales Invoice Print Formats
2011-11-16 14:02:30 +05:30
Anand Doshi
ded71563c8
Merge pull request #142 from anandpdoshi/master
...
New Print Formats as part of erpnext repository
2011-11-16 00:02:43 -08:00
Anand Doshi
c573fb8eed
Modified patch install_print_formats to reload the newly added Print Formats
2011-11-16 13:31:21 +05:30
Anand Doshi
e3559853bd
Added new Print Formats as part of repository
2011-11-16 13:18:45 +05:30
Nabin Hait
0c92493c81
Fixed check_for_acc_of_supplier validation
2011-11-16 10:12:32 +05:30
Anand Doshi
86e91e5dce
Changes in patch for installation of new print formats
2011-11-15 18:06:16 +05:30
Anand Doshi
f8b01097ac
Merge branch 'master' of github.com:webnotes/erpnext
...
Conflicts:
index.html
2011-11-15 15:24:11 +05:30
Anand Doshi
3cb68e17b9
New Print Formats
2011-11-15 15:22:44 +05:30
Nabin Hait
5b7badaf20
supplier account head validated with supplier
2011-11-11 12:37:53 +05:30
Nabin Hait
ff72835ad9
Qty consumed per unit field type currency to data
2011-11-10 14:37:47 +05:30
Nabin Hait
e098481f45
Pull items from BOM for production issue
2011-11-10 10:56:53 +05:30
Nabin Hait
33e19480ae
UOM field added in BOM, will be fetched from item master
2011-11-09 13:53:16 +05:30
Nabin Hait
2cca0e7620
test case added for multiple stock entry for same datetime
2011-11-09 12:12:53 +05:30
Nabin Hait
93ba4fbaa4
Fixes related to finding prev sle
2011-11-08 15:30:04 +05:30
Nabin Hait
235439df5b
bin fixes for reposting future entries
2011-11-08 12:52:51 +05:30
Nabin Hait
76228f1c79
bin fixes for reposting future entries
2011-11-08 12:49:24 +05:30
Rushabh Mehta
d77cb27bd2
fixes to bin for reposting future entires
2011-11-08 12:06:02 +05:30
Rushabh Mehta
efd222b6ac
logout fix
2011-11-08 10:39:52 +05:30
Nabin Hait
cc02fd445c
Repair button only visible after submit
2011-11-07 12:14:28 +05:30
Nabin Hait
30d34c4311
sal manager reload patch
2011-11-07 11:07:50 +05:30
Nabin Hait
990a5eacca
sal manager reload patch
2011-11-07 10:51:29 +05:30
Nabin Hait
c67e0d85d3
Employemnt Type filter removed from salary manager
2011-11-07 10:48:51 +05:30
Rushabh Mehta
ae00547592
appriasal copy fix
2011-11-04 10:43:11 +05:30
Rushabh Mehta
36fc1d06fb
appriasal copy fix
2011-11-04 10:41:12 +05:30
Anand Doshi
9207f51ced
Changed image path to lib/images
2011-11-01 10:55:02 +05:30
Anand Doshi
3ee06a924a
Fixed Knowledge Base Issue
2011-11-01 10:46:49 +05:30
Anand Doshi
30cf682e46
Change criteria name of employeewise_balance_leave_report
2011-10-31 17:41:04 +05:30
Anand Doshi
25190a903c
Report to get Employeewise Balance Leave
2011-10-31 16:47:48 +05:30
Anand Doshi
dac955b897
Merge branch 'master' of github.com:webnotes/erpnext
2011-10-25 10:58:17 +05:30
Anand Doshi
867895404e
Reverting the change '`' as it is taken care of by default
2011-10-25 10:54:49 +05:30
Anand Doshi
cd04d950a1
Merge pull request #137 from anandpdoshi/master
...
Changed path to image files in my_company.js
2011-10-24 03:21:19 -07:00
Anand Doshi
b16c231158
changed path to image files
2011-10-24 15:49:11 +05:30
Anand Doshi
71e3c9be66
Merge pull request #136 from anandpdoshi/master
...
Trend Analyser - allow table names with space
2011-10-24 02:18:24 -07:00
Rushabh Mehta
9666e657ce
fixed fpe in bin
2011-10-24 14:35:04 +05:30
Rushabh Mehta
06f432f4c7
fixes to valuation control
2011-10-24 11:59:22 +05:30
Anand Doshi
2cde8670f2
enclosed table names in "`" to allow spaces in table names while querying
2011-10-24 11:39:36 +05:30
Rushabh Mehta
09dba5cf1d
fixes to valuation control
2011-10-24 11:17:36 +05:30
Nabin Hait
612efe843b
POS Setting js code restored from history
2011-10-21 16:19:58 +05:30
Nabin Hait
e2f0c5dfd0
Trend analyzer fix due to project field movement to item level in pur cycle
2011-10-21 14:55:16 +05:30
Nabin Hait
d0c9d422af
patch for project changes in pur cycle
2011-10-20 19:21:03 +05:30
Nabin Hait
1979ad0586
Project wise analysis included in trend analyzer
2011-10-20 19:20:16 +05:30
Nabin Hait
57dd62d790
project column moved to item table in pur cycle
2011-10-20 19:19:07 +05:30
Nabin Hait
69554511da
fixes in patch
2011-10-19 16:35:39 +05:30
Nabin Hait
2eb5ae48f7
patch: default print format for invoice is standard
2011-10-19 16:06:37 +05:30
Nabin Hait
13800440f1
fixed issue in patch
2011-10-19 15:38:42 +05:30
Nabin Hait
d751c1d40d
patch for reloading print format and new POS format
2011-10-19 15:33:27 +05:30
Nabin Hait
68791fb13d
resolved conflict
2011-10-19 15:15:51 +05:30
Nabin Hait
7762bdaf77
Letter head issue fixed in print format
2011-10-19 15:05:26 +05:30
Rushabh Mehta
790f453490
version update for wnf
2011-10-19 14:06:32 +05:30
Nabin Hait
ec7a85d11f
'Delivery Note Packing List Wise' print format modified
2011-10-18 19:03:02 +05:30
Nabin Hait
1546003d69
issue fixed in patch
2011-10-18 18:47:08 +05:30
Nabin Hait
0c005421fe
Packing slip issues fixed and modified print format
2011-10-18 16:44:20 +05:30
Nabin Hait
a315a31919
Issue fixed in get stock qty if bin not exists
2011-10-17 15:01:31 +05:30
Nabin Hait
e7c4a4011f
acc bal repost patch moved in separate file
2011-10-14 19:05:38 +05:30
Nabin Hait
df8304f00b
acc bal repost patch moved in separate file
2011-10-14 19:05:08 +05:30
Nabin Hait
c0d7434794
Edited erpnext/patches/patch.py via GitHub
2011-10-14 00:14:31 +05:30
Nabin Hait
989462b669
account balance reposting with freezing current session
2011-10-13 17:33:30 +05:30
Nabin Hait
1a1ce709e0
Changes regarding POS fields
2011-10-13 14:08:33 +05:30
Nabin Hait
d84ad942d1
Removed repost patch
2011-10-13 14:04:26 +05:30
Nabin Hait
fe4c4f94da
repost account balance patch
2011-10-13 11:07:14 +05:30
Nabin Hait
a6f0550d40
test cases for leave
2011-10-12 17:04:31 +05:30
Nabin Hait
c7cf94ec7b
page break allow_on_submit
2011-10-12 13:16:11 +05:30
Nabin Hait
ee9efb568b
flds added in mapper
2011-10-12 12:42:07 +05:30
Nabin Hait
89a9a26524
page_break column allow_on_submit
2011-10-12 12:41:00 +05:30
Nabin Hait
db3728955b
error fixed in leave calculation
2011-10-11 17:11:24 +05:30
Nabin Hait
685564f71d
Resolved conflict after merging with master
2011-10-11 14:42:34 +05:30
Nabin Hait
fb37157163
packing slip related changes and test case for item
2011-10-11 13:57:48 +05:30
Nabin Hait
c1d4281718
packing slip related changes
2011-10-11 12:50:55 +05:30
Rushabh Mehta
5f66d60bdd
fixed login url
2011-10-11 10:58:11 +05:30
Rushabh Mehta
6edb4635e6
fixed bugs
2011-10-11 10:50:23 +05:30
Ravi Dey
24ef523cac
Issue fixed in setup control
2011-10-10 18:39:49 +05:30
Nabin Hait
15cad19d7c
Serial No moved to Stock module from Support module
2011-10-10 17:10:24 +05:30
Nabin Hait
2810691979
field hide/unhide for pos
2011-10-10 12:33:43 +05:30
Nabin Hait
6a0561612f
cost center groupto ledger and vice versa
2011-10-10 12:23:10 +05:30
Nabin Hait
8e54aa882a
patch for page break issue
2011-10-07 19:03:19 +05:30
Nabin Hait
ddaa5a33fe
reload PO-PR mapper
2011-10-07 12:36:13 +05:30
Nabin Hait
7a941869ab
clear cache forcefully
2011-10-07 12:30:48 +05:30
Nabin Hait
d08fe6099a
map schedule date from po to pr
2011-10-07 12:11:19 +05:30
Nabin Hait
914491f630
deleted duplicate button from QA inspection report
2011-10-06 10:23:26 +05:30
Nabin Hait
c68e045014
deleted duplicate button from QA inspection report
2011-10-05 17:01:16 +05:30
Nabin Hait
5630049d2a
QA Inspection: get_query
2011-10-05 16:57:36 +05:30
Nabin Hait
1971942db8
purchase tax mapping while pulling
2011-10-05 14:56:16 +05:30
Nabin Hait
da50c0859c
features by default on
2011-10-05 12:10:08 +05:30
Nabin Hait
a55eec137f
Fieldname changed in Features Setup
2011-10-05 11:47:08 +05:30
Nabin Hait
b30c4a6611
Fieldname changed in Features Setup
2011-10-05 11:36:16 +05:30
Nabin Hait
a970b11cfb
Test case added for Material Issue
2011-09-30 18:05:08 +05:30
Nabin Hait
61985ac5fa
get_query modified for item in quotation
2011-09-30 17:46:08 +05:30
Nabin Hait
88e5170bd0
Test case added for MTN
2011-09-30 17:21:41 +05:30
Nabin Hait
88f9cb5d24
Test case added for MTN
2011-09-30 17:20:06 +05:30
Nabin Hait
31665e538a
Test Case:
...
stock entry submit and cancel
Sandbox created for maintaining testdata and testcases
2011-09-29 10:41:02 +05:30
Nabin Hait
79e8247d82
fix in stock ledger
2011-09-29 10:40:04 +05:30
Nabin Hait
fff40599e8
test field deleted from warehouse
2011-09-29 10:39:44 +05:30
Nabin Hait
525887fd8a
Error fixed in auth control
2011-09-27 17:00:01 +05:30
Nabin Hait
c8d5625763
removed trashed profile from user search result
2011-09-27 15:26:29 +05:30
Nabin Hait
d9a16a282c
deleted gl_entry.js file
2011-09-27 15:10:07 +05:30
Nabin Hait
ec451da2f4
Re-written update_against_document_in_jv function in RV and PV
2011-09-27 12:47:59 +05:30
Nabin Hait
e2df68bb5b
reload internal reconciliation
2011-09-27 12:47:09 +05:30
Nabin Hait
e76e2a1172
reload internal reconciliation
2011-09-27 12:45:48 +05:30
Nabin Hait
80ed6b25e8
deleted gl_control.js file
2011-09-27 11:53:23 +05:30
Nabin Hait
7e97d1f390
rebuild all tree through push_patch
...
Appraisal score allowed to be fraction
unhide group/ledger field in cost senter for import purpose
update_nsm_model in cost center on_trash()
2011-09-27 11:34:06 +05:30
Nabin Hait
3c8a50c257
Trial balance opening issue fixed if there is no prev year
2011-09-27 11:16:30 +05:30
Nabin Hait
a77cea2b90
Dont add opening entries in account balance debit, credit column
2011-09-27 11:14:54 +05:30
Nabin Hait
c752d075e6
fixed issue in reseting in opening balance, clear bal only that company
2011-09-27 11:04:24 +05:30
Nabin Hait
5c55e43234
trend analyzer issue fixed
2011-09-27 10:57:14 +05:30
Nabin Hait
c034e3d531
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-27 10:55:24 +05:30
Nabin Hait
39297e5775
update_nsm_model in cost center on_trash()
2011-09-27 10:36:17 +05:30
Nabin Hait
d223d12308
Rewritten update_against_document function
2011-09-26 18:57:43 +05:30
Nabin Hait
5f2046496b
Internal Reconciliation: for knock out booking and payment entries
2011-09-26 18:56:02 +05:30
Nabin Hait
2736fd59ca
fixed cancelled gl entry issue in period closing voucher
2011-09-26 12:55:52 +05:30
Nabin Hait
a28e366c15
deleted duplicate button fron JV
2011-09-22 16:32:02 +05:30
Nabin Hait
5941ae3b75
Default account creation order changed
2011-09-22 16:10:43 +05:30
Nabin Hait
b3ce0ecb34
repost account balance through push patch
2011-09-22 16:10:15 +05:30
Nabin Hait
e8475f9b85
Appraisal score allowed to be fraction
2011-09-22 11:00:53 +05:30
Nabin Hait
fdb0e362a7
update valuation and bin_aqat patch applicable after 01-09-2009 entries
2011-09-19 12:22:47 +05:30
Nabin Hait
48a52d42ed
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-16 17:29:30 +05:30
Nabin Hait
f060d0cd16
contact address will be fetched in sales invoice onload when come through mapper
2011-09-16 17:28:49 +05:30
Rushabh Mehta
32e00cb050
missing buttons
2011-09-16 16:28:35 +05:30
Nabin Hait
618d65b6ad
company delete permission to system manager
2011-09-16 15:55:19 +05:30
Nabin Hait
e10900115e
updated company on_trash function
2011-09-16 15:50:45 +05:30
Nabin Hait
d984872be9
checked sal struc docstatus in validation
2011-09-16 14:47:19 +05:30
Nabin Hait
2d26fe48ed
removed sal structure amend permission
2011-09-16 14:35:57 +05:30
Nabin Hait
1dfb3fc7d8
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-16 14:33:38 +05:30
Nabin Hait
0b5f9b0475
update valuation and bin_aqat patch
2011-09-16 14:32:23 +05:30
Nabin Hait
8c9a5af231
Error fixed in bin
2011-09-16 12:51:19 +05:30
Nabin Hait
73c4a4a154
removed make_feed() function
2011-09-16 11:24:54 +05:30
Nabin Hait
ecc75123e8
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-15 15:40:53 +05:30
Nabin Hait
6ae7f8fe58
check serial nos bin qty only if serial no entered into the document
2011-09-15 15:40:27 +05:30
Rushabh Mehta
2adbd89ada
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-15 15:09:14 +05:30
Rushabh Mehta
53ba83158c
fixes to startup
2011-09-15 15:06:23 +05:30
Nabin Hait
3b19f6b7c8
opening balance fixes in general ledger
2011-09-15 14:38:54 +05:30
Rushabh Mehta
0aed26d83d
moved report to folder
2011-09-15 13:00:46 +05:30
Rushabh Mehta
2773940db1
merged from master
2011-09-15 12:55:25 +05:30
Rushabh Mehta
1e11cb486d
merging from master and usability fixes to setup
2011-09-14 13:25:10 +05:30
Rushabh Mehta
5f50617121
removed readme
2011-09-13 15:48:51 +05:30
Rushabh Mehta
cbaae20328
breakup of farmework files
2011-09-08 19:07:14 +05:30
Rushabh Mehta
5caedffff8
fixes to buttons etc
2011-09-08 15:45:37 +05:30
Rushabh Mehta
8cf45175a7
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-08 14:17:41 +05:30
Rushabh Mehta
5ede3e8411
fixes to home (multiple loading)
2011-09-08 14:16:34 +05:30
Rushabh Mehta
11c6be065a
ready for 0.1
2011-09-06 15:50:01 +05:30
Rushabh Mehta
aa7b05aaeb
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-06 12:47:51 +05:30
Rushabh Mehta
b5717bd807
patch etc fixes
2011-09-06 12:46:33 +05:30
Rushabh Mehta
66ac2b018a
first cut for lazy loading framework
2011-09-05 18:43:09 +05:30