Anand Doshi
2878cc7757
[fix] get bom items query
2015-02-24 12:39:42 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
7b19b9ed02
minor fixes
2015-02-24 10:04:00 +05:30
Nabin Hait
6dfbc2465b
Patch: taxes and totals in party currency
2015-02-24 10:04:00 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8
Fields added in all sales and purchase doctypes
2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60
Validate taxes and charges input, commonified
2015-02-24 10:02:28 +05:30
Nabin Hait
34afcfb4a1
Print without amount in delivery note
2015-02-24 10:02:27 +05:30
Nabin Hait
e9eec93be7
minor fix
2015-02-24 10:02:27 +05:30
Nabin Hait
f0bc9b6d3a
Renamed Net total to Total and dynamic label
2015-02-24 10:02:27 +05:30
Nabin Hait
755ff60313
tax amount conversion in client side printing
2015-02-24 10:02:27 +05:30
Nabin Hait
de9c8a9028
discount calculation and in print view
2015-02-24 10:02:27 +05:30
Nabin Hait
2b019ed430
Fixes for discount amount
2015-02-24 10:02:27 +05:30
Nabin Hait
ce24512ed7
Commonified sales/purchase taxes and charges master.js code
2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf
Taxes and totals calculation in party currency
2015-02-24 10:02:27 +05:30
Pratik Vyas
81d96fdb60
Merge pull request #2839 from pdvyas/v5-lang
...
update translations and patch to new format
2015-02-23 23:51:29 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +05:30
Rushabh Mehta
a1da88a3d3
[capacity planning] automatically plan Time Logs from Production Order
2015-02-23 20:18:38 +05:30
Rushabh Mehta
93b2f167f8
[fixes] opportunity, task minor
2015-02-23 14:43:16 +05:30
Rushabh Mehta
281dc5d639
[patch] added item patch
2015-02-23 14:43:15 +05:30
Rushabh Mehta
d06c1188a0
[item] patches
2015-02-23 14:43:15 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
65a2759432
[minor] opportunity / item
2015-02-21 17:35:50 +05:30
Rushabh Mehta
7bbbda162c
[warranty claim] ux - serial no on top
2015-02-21 14:49:17 +05:30
Rushabh Mehta
364054a6fc
[fix] payment tool #2791
2015-02-21 14:39:35 +05:30
Rushabh Mehta
e8a37949cf
[issue fixes] + added fixtures for item attribute and operation
2015-02-20 20:10:11 +05:30
Pratik Vyas
7f9489e814
Update transaction_base.py
2015-02-20 16:22:24 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
bcccfa09f2
[patch] [fix]
2015-02-20 15:28:50 +05:30
Pratik Vyas
62ab126ca9
update translations and patch to new format
2015-02-20 15:20:37 +05:30
Rushabh Mehta
dc93e0adc6
[fixes] stock reco
2015-02-20 15:11:56 +05:30
Nabin Hait
ad3fd5166b
update stock uo in sle for DN
2015-02-20 14:23:58 +05:30
Sambhaji Kolate
973f78e7d3
fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802
2015-02-20 13:09:39 +05:30
Rushabh Mehta
d51a47155b
[fixed] #2614
2015-02-20 10:39:39 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
c7a11cc451
[usability] [fixes] stock entry and production order
2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Nabin Hait
3fa7cc524b
Update sales_order_item.json
2015-02-18 21:11:45 +05:30
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