Nabin Hait
96c4252762
reload account in patch
2015-05-13 14:55:12 +05:30
Nabin Hait
f6e4723101
minor fix in landed cost voucher
2015-05-13 12:53:11 +05:30
Nabin Hait
7a9646959a
Allowed purchase order in different uom than in Material request
2015-05-13 12:42:29 +05:30
Pratik Vyas
119c4cf176
bumped to version 4.25.6
2015-05-13 12:24:39 +06:00
Nabin Hait
b45d4e0e16
In general ledger report opening amount is purely based on posting date
2015-05-12 17:40:14 +05:30
Nabin Hait
6c0c5702c5
patch fix : replace fields in print formats and custom scripts
2015-05-12 16:49:40 +05:30
Nabin Hait
4ed40be3c2
remove toggling SO and DN field in SI based on pos
2015-05-12 15:26:45 +05:30
Nabin Hait
2d76825936
remove toggling SO and DN field in SI based on pos
2015-05-12 15:24:55 +05:30
Nabin Hait
4b9b92ba2f
minor fix in report
2015-05-12 15:12:30 +05:30
Nabin Hait
ffc7f3fef6
Apply default taxes on loading of document
2015-05-12 15:07:02 +05:30
Nabin Hait
23d6eb7e5c
patch fixed for making email acocounts
2015-05-12 15:02:33 +05:30
Nabin Hait
8ba849184f
Fix taxes and totals in party currency
2015-05-12 12:50:43 +05:30
Nabin Hait
8719c1a6b8
Fix taxes and totals in party currency
2015-05-12 12:28:26 +05:30
Rushabh Mehta
73249551e8
[fix] [hot] website product list make full urls
2015-05-12 11:37:47 +05:30
Rushabh Mehta
9cf1edc2c0
[fix] [hot] website product list make full urls
2015-05-12 11:32:25 +05:30
Rushabh Mehta
8f96c39be6
[minor] setup wizard via error report
2015-05-12 11:32:25 +05:30
Rushabh Mehta
92015a1268
[fix] [minor] escape in report
2015-05-12 11:32:25 +05:30
Rushabh Mehta
4f1a7e5aa8
[fix] newsletter list duplicate
2015-05-12 11:32:25 +05:30
Nabin Hait
ec361ea648
exchange rate fix
2015-05-11 18:14:45 +05:30
Neil Trini Lasrado
6c85479e4f
view leads button added to campaign
2015-05-11 17:56:36 +05:30
Nabin Hait
dd82bf2ad9
Exchange rate issue fixed
2015-05-11 16:49:31 +05:30
Pratik Vyas
3d77de9cf9
[fix] rename table fieldnamess patch
2015-05-11 16:08:14 +05:30
Nabin Hait
fedcb242ef
Rename table fieldnames only if doctype exists
2015-05-11 15:11:17 +05:30
Nabin Hait
affb3ec220
Item variants: validation added
2015-05-11 15:11:17 +05:30
Neil Trini Lasrado
2edc91bc52
Leave Type - LWP changed to Leave Without Pay
2015-05-11 14:38:21 +05:30
Neil Trini Lasrado
ec2f3d6e63
leave_allocation layout changed
2015-05-11 14:38:20 +05:30
Pratik Vyas
2fb0654f97
Show bulk limit error before sending
2015-05-11 14:29:52 +05:30
Rushabh Mehta
4439493232
[welcome-mails] add video links
2015-05-11 12:52:36 +05:30
Nabin Hait
93e0ec6663
Show only sub-contracted purchase order in stock entry for subcontracting
2015-05-11 11:32:38 +05:30
Nabin Hait
d1a64d89be
date issue fixed serial no
2015-05-11 11:32:38 +05:30
Nabin Hait
8f5b8c658a
fixes for renaming taxes and charges master
2015-05-11 11:32:38 +05:30
Rushabh Mehta
20a41b52cd
[temp-fix] missing product image
2015-05-09 12:18:17 +05:30
Nabin Hait
6752b31091
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:49:50 +05:30
Nabin Hait
e27690ceda
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:43:10 +05:30
Rushabh Mehta
ab1ed013b3
[hot] taxes
2015-05-08 11:09:25 +05:30
Nabin Hait
15c284497b
fixed patch
2015-05-08 01:28:01 +05:30
Nabin Hait
fbdc0dc7d1
fixed patch
2015-05-08 01:24:28 +05:30
Nabin Hait
752479d08d
patch order changed
2015-05-08 01:15:39 +05:30
Nabin Hait
53f17009bc
Merge pull request #3215 from neilLasrado/prod-order
...
Production Order - Fixed cost not considering qty issue
2015-05-07 18:55:02 +05:30
Neil Trini Lasrado
3c3cdc7029
fixes
2015-05-07 18:52:12 +05:30
Pratik Vyas
7e143a5fdd
bumped to version 4.25.5
2015-05-07 19:00:37 +06:00
Rushabh Mehta
55dc66ffcc
[fix] index for sales order item
2015-05-07 18:16:49 +05:30
Neil Trini Lasrado
20e1c781b6
js call changed to trigger
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
a10bdd4980
fixes
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
e64d453d09
patch added
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
4f5cc9d672
Test case added to Production Order to check planned-operating-cost against qty
2015-05-07 17:31:24 +05:30
Neil Trini Lasrado
e63146408d
production order - fixes cost not considering qty issue
2015-05-07 17:31:24 +05:30
Nabin Hait
08c0c04ef2
Removed old page style Stock ledger end stock level report
2015-05-07 16:59:51 +05:30
Nabin Hait
c62c64c38b
patch fixed for taxes and charges template
2015-05-07 16:58:28 +05:30
Nabin Hait
28b18222c0
capacity planning patch fixed
2015-05-07 16:29:51 +05:30
Nabin Hait
574d5ff535
fetch only stock items as raw materials supplied for subcontracting
2015-05-07 16:29:29 +05:30
Nabin Hait
4bfbd29411
Permission for Stock ledger and balance report
2015-05-07 15:41:09 +05:30
Nabin Hait
d5e2788cb4
Permission for Stock ledger and balance report
2015-05-07 15:28:21 +05:30
Rushabh Mehta
3545575c8b
[jsonrates api] add from global defaults
2015-05-07 15:16:37 +05:30
Rushabh Mehta
2682278ad9
Merge pull request #3221 from neilLasrado/hr
...
employee removed from HR setup
2015-05-07 14:59:45 +05:30
Neil Trini Lasrado
d1c413a668
employee removed from HR setup
2015-05-07 12:40:18 +05:30
Rushabh Mehta
66fa1ff878
[enhancement] automatic exchange rates via jsonrates
2015-05-07 12:26:09 +05:30
Rushabh Mehta
009378e187
[rename]
2015-05-06 22:59:00 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Neil Trini Lasrado
b4a298ddd4
multiple dependant tasks added
2015-05-06 14:47:34 +05:30
Neil Trini Lasrado
b3b373d0ac
fixes in Test Cases
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
350943128a
fixes in Pull request
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
c8f0c25088
referenceError name changed to circularReferenceError
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
1fa8ed8a1f
Test Cases Added, fixes in task
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
3da42fcdf9
fixed import errors
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
fa381c7a6c
task-rescheduling - handled exception if date is None
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
46d859e694
re-schedule dependaable task logic added
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
93583faaf0
depends-on added to task, circular reference validation added
2015-05-06 14:47:33 +05:30
Nabin Hait
a0b1124d6f
minor fix in report
2015-05-06 11:59:43 +05:30
Nabin Hait
0e1540b3b7
material request saving issue fixed
2015-05-05 17:26:35 +05:30
Nabin Hait
2b3e065efc
[fix] taxes and charges input value
2015-05-05 16:33:58 +05:30
Nabin Hait
40557750d5
party model patch fix
2015-05-05 16:00:21 +05:30
Nabin Hait
cf22fdbc85
party model patch fix
2015-05-05 14:22:10 +05:30
Nabin Hait
61092c0a88
Pos item view: show item name and item code
2015-05-05 12:27:11 +05:30
Rushabh Mehta
4f41bb35b9
Merge pull request #3192 from neilLasrado/purchase-costing
...
Purchase costing in Projects
2015-05-05 10:59:11 +05:30
Rushabh Mehta
deed16066e
Merge pull request #3209 from rmehta/email-threading
...
[email] changes in email_account api
2015-05-05 10:55:50 +05:30
Nabin Hait
7104cf613f
party model patch fix
2015-05-04 19:21:36 +05:30
Rushabh Mehta
82ee5fdba6
[email] changes in email_account api
2015-05-04 18:17:22 +05:30
Nabin Hait
64568fb296
Default expense account and cost center are always visible in item
2015-05-04 16:16:12 +05:30
Nabin Hait
f73aa079a0
item list view indicator fix
2015-05-04 16:06:59 +05:30
Nabin Hait
72f71836d7
Party model patch fix
2015-05-04 13:01:44 +05:30
Nabin Hait
c91a9e5231
Delete company and company transactions are separate functions
2015-05-04 11:51:21 +05:30
Rushabh Mehta
e991c9e075
[fix] [typo] fixes #3193
2015-05-04 11:04:54 +05:30
Nabin Hait
874ead2ed9
Update warehouse as per master_name if master_name exists
2015-05-04 08:53:57 +05:30
Rushabh Mehta
c712cdb580
[fix] tax with both actual and rate type
2015-05-03 22:20:56 +05:30
Nabin Hait
f550ecf93e
Maintain same currency exchnage rate while mapping
2015-05-02 18:46:42 +05:30
Nabin Hait
69cdf59d63
Maintain same currency exchnage rate while mapping
2015-05-02 18:46:29 +05:30
Nabin Hait
fb1f4a5c58
User permissions for Expense Claim
2015-05-02 18:46:29 +05:30
Nabin Hait
b0e9c06f93
Stock Entry agianst Manufaturing: fetch only stock items from bom
2015-05-02 18:46:29 +05:30
kressi
d853353c28
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-02 10:24:56 +02:00
kressi
d1aa37f521
removed attributes from frappe is_website_user
2015-05-02 10:24:17 +02:00
Nabin Hait
d51b09282a
link warehouse with account
2015-05-01 20:31:11 +05:30
Pratik Vyas
ef7d6ae1f5
bumped to version 4.25.4
2015-05-01 17:12:36 +06:00
Nabin Hait
ba43afc461
fix in chart of cost centers
2015-05-01 16:41:15 +05:30
Nabin Hait
9dd9150d2c
fix for duplicate item
2015-05-01 16:41:15 +05:30
Nabin Hait
f25822cd8d
fix in patches
2015-05-01 15:50:52 +05:30
Nabin Hait
2ca18ff913
Stock Entry validation in Journal Entry
2015-05-01 12:46:59 +05:30
Rushabh Mehta
5dbf8a7418
[cleanup] frappe.get_user
2015-05-01 11:51:26 +05:30
Nabin Hait
7981ea0e6c
duplicate item message
2015-05-01 11:10:37 +05:30
Nabin Hait
816cb8c141
Migrate customized precision for newly created total fields
2015-05-01 11:10:37 +05:30
Anand Doshi
e6ac87e86f
Gross Profit Report: Company filter should be reqd
2015-04-30 15:33:31 -07:00
Rushabh Mehta
ec3ad7d865
[enhancement] close opportunities from list view
2015-04-30 17:17:50 +05:30
Pratik Vyas
7358e6a100
bumped to version 4.25.3
2015-04-30 17:01:02 +06:00
Nabin Hait
aa03a8e3a2
Migrate customized precision for newly created total fields
2015-04-30 16:13:47 +05:30
Nabin Hait
1bf03289a6
Service items should not be considered as raw material in production planning tool
2015-04-30 16:13:47 +05:30
Nabin Hait
c5b8f7eb46
fix in trends report
2015-04-30 16:13:46 +05:30
Nabin Hait
4ffee99ba3
Removed duplicate item validation
2015-04-30 16:13:46 +05:30
Neil Trini Lasrado
42a554e5cb
fixes in Purchase Invoice
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
01720404db
fixes in Test Cases
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
349461e9e6
Test Cases Added
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
9a56764bf2
Total Purchase Cost added to Projects
2015-04-30 13:06:02 +05:30
Rushabh Mehta
5e13799704
[fixes] leave approver selection and cleaned up layout
2015-04-30 12:55:10 +05:30
Nabin Hait
6e659a4f27
Service items should not be considered as raw material in production planning tool
2015-04-30 11:51:24 +05:30
Nabin Hait
acfdce6ade
Removed duplicate item validation
2015-04-30 11:51:24 +05:30
Nabin Hait
4716278f69
minor fix in chart of cost centers
2015-04-29 19:12:46 +05:30
Nabin Hait
2db8dc922a
fixed trial balance related to showing zero balance
2015-04-29 18:39:33 +05:30
Nabin Hait
5207d1205e
minor issue fixed for precision
2015-04-29 15:38:14 +05:30
Nabin Hait
6e59aca394
[enhancement] sort root accounts as assets, liability, equity, income, expense
2015-04-29 13:08:00 +05:30
Nabin Hait
59ab65ded6
fixed trial balance related to showing zero balance
2015-04-29 13:08:00 +05:30
Rushabh Mehta
0590cdceab
[enhancement] sort root accounts as assets, liability, equty, income, expense
2015-04-29 12:26:15 +05:30
Nabin Hait
081935eff7
[fix] fetch bank/cash account
2015-04-28 19:08:42 +05:30
Nabin Hait
2ff177a4fb
fix for opening purchase invoice
2015-04-28 17:17:37 +05:30
Nabin Hait
47e5c764c3
[fix] accounts payable report
2015-04-28 16:45:32 +05:30
Rushabh Mehta
45ca8a4d31
[minor] save last company in multi-company scenario
2015-04-28 16:04:56 +05:30
Nabin Hait
b1b95526c6
Update sales_invoice.js
2015-04-28 13:56:48 +05:30
Nabin Hait
872eaf1541
Update purchase_invoice.js
2015-04-28 13:56:17 +05:30
Nabin Hait
aef76bfa1d
Update journal_entry.js
2015-04-28 13:55:04 +05:30
Nabin Hait
042f86e555
advance paid should not be copied and patch to fix affected records
2015-04-28 13:00:23 +05:30
Nabin Hait
67fdbcf242
precision fixed in batch-wise balance report
2015-04-28 12:53:26 +05:30
Nabin Hait
5ce31174be
precision fixed in batch-wise balance report
2015-04-28 12:36:53 +05:30
Nabin Hait
3be69d4d81
patch for updating temporary account type
2015-04-27 18:33:05 +05:30
Nabin Hait
5616ff417c
Account type Temporary and removed Aging Date field from all documents
2015-04-27 18:08:51 +05:30
Pratik Vyas
b17f056f8d
bumped to version 4.25.2
2015-04-27 17:59:52 +06:00
Rushabh Mehta
50ce9753e0
[minor] added cache in get_value
2015-04-27 13:13:50 +05:30
Nabin Hait
3c3855ac8c
advance paid should not be copied and patch to fix affected records
2015-04-27 11:25:56 +05:30
Anand Doshi
8be3ba36d9
fixed relative urls in some web pages
2015-04-24 13:22:08 -04:00
Nabin Hait
9c8b6eb815
minor fix in completed production orders report
2015-04-24 18:36:02 +05:30
Nabin Hait
52cf6e947c
patch fix
2015-04-24 16:07:32 +05:30
Rushabh Mehta
6894b9e457
[minor] only one Temporary Opening account
2015-04-24 14:22:54 +05:30
Nabin Hait
01e4c8f0f8
fix in chart of accounts
2015-04-23 16:29:15 +05:30
Rushabh Mehta
a30c76f430
[ux] [layouts] project page
2015-04-23 15:23:47 +05:30
Nabin Hait
218a1267c9
Merge pull request #3146 from neilLasrado/project
...
FIxes - Time Log Hours calculation
2015-04-23 14:37:23 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Neil Trini Lasrado
8e4cf13d01
fixes time log hours calculation
2015-04-22 16:23:36 +05:30
Neil Trini Lasrado
d3179a733b
datatype of hour_rate in Production order operations and bom operation changed to float
2015-04-22 16:11:48 +05:30
Neil Trini Lasrado
6a066e07e5
Time Log - to_time trigger called on_load to calculate hours if Tl is created via Calender
2015-04-22 16:11:48 +05:30
Nabin Hait
4669fe3e85
minor fix
2015-04-22 15:34:44 +05:30
Neil Trini Lasrado
ecb5d11e2d
Today added as default date for posting date in expense claim
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
051d0ab79a
function name validate cost changed to update cost in Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
5e317d2b72
fixes in Expense Claim and get_avtivity_cost function
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
832dfe7980
fixes in Time Log Batch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
086c0463be
Fixes in Patch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e1951306eb
fix in time log batch list
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
da8c6f6ae2
test case fix for Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
50a0fd6204
feild rename fixes in Project
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e7ddb72e7f
patch for renaming project feilds
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4cffbe26dc
rate removed from time log batch
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
d4b33d3c14
Costing added in Time log Batch, Sales Order added to Project + more fixes
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4e6e4726a4
filters added, ui change, update project moved to project.py
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
ec5c66f8f0
Title Feild added to Expense Claim
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88
fixes in Test Cases
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
9789d06b3e
task and project- billing amount and actual amount added
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
650e679a5e
Fixes in Project
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
78b96ca769
Fixes in time_log
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
c33ad6b36a
fixes in Activity Cost
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
2679b247b3
fixes in Expense Claim
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
7f9ea3bf6a
expense claim test records
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
33d58ac431
Test Cases
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
709c43674b
feild rename - internal rate/cost into costing rate/amount
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
aabf150423
task made mandatory in project
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
a11770f06f
in Time Log - Server side validations added to recalculate cost on save
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
50234cb0fe
Task added to expense claim
...
all cost (expense claim and time log) against Task; task updates project cost.
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
8026137998
employee name added to activity cost
...
title changed for activity type
time log -fetch logic added for billing and internal rate
validations and calculation logic added
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
458b8885f0
New Document Activity Cost created.
...
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
2015-04-22 11:25:57 +05:30
Neil Trini Lasrado
d93750a868
Manufacturing Settings - Datatype of capacity_planning_for_days and mins_between_operations changed to Int
2015-04-21 17:40:37 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Neil Trini Lasrado
261e27b9ec
type of Hour rate in Production order operations and bom operations changed to currency (previouslly float). Desc to Actual Operation Cost changed
2015-04-21 16:43:43 +05:30
Nabin Hait
e68e86f109
execute on_doctype_update
2015-04-21 15:26:42 +05:30
Rushabh Mehta
50918a8fcf
[pos] fixes #3138 , #3140
2015-04-21 14:38:48 +05:30
Rushabh Mehta
4665f7eb70
[enhancement] added description, batch_no in packing slip
2015-04-21 11:20:24 +05:30
Rushabh Mehta
80381475c4
[ux] re-arranged columns in bank reconciliation, fixes #3114
2015-04-21 11:08:53 +05:30
Rushabh Mehta
dfa93305ab
[minor] fixes #3127
2015-04-21 10:36:39 +05:30
Rushabh Mehta
7f9c4d8677
[fix] item grid fix, via #3136
2015-04-21 10:19:53 +05:30
Nabin Hait
5c7f0bcb32
Party filter and columns in general ledger report
2015-04-20 17:13:53 +05:30
Rushabh Mehta
e9bd77d674
[minor] fixes in welcome mails
2015-04-20 13:00:56 +05:30
Nabin Hait
44aaa56000
get standard chart of account if country code not found
2015-04-20 11:51:54 +05:30
Pratik Vyas
dbb3b49625
bumped to version 4.25.1
2015-04-20 11:14:21 +06:00
Pratik Vyas
b78ab03b2b
Merge 'upstream/master' into v4.x.x (account receivable hotfix)
2015-04-20 10:41:31 +05:30
Rushabh Mehta
80f8b7be2f
[minor] [perms] Expense Claim Type
2015-04-19 16:18:15 +05:30
Rushabh Mehta
d7330ec709
[minor] add disabled property in fiscal year:
2015-04-18 17:04:04 +05:30
Rushabh Mehta
92b253dceb
Update accounts_receivable.py
2015-04-18 12:13:57 +05:30
Nabin Hait
1b26c6f02a
Merge pull request #3125 from nabinhait/v4.x.x
...
hotfix in patch
2015-04-17 16:16:35 +05:30
Nabin Hait
0287b1f75c
hotfix in patch
2015-04-17 16:15:25 +05:30
Pratik Vyas
e7eb92ce70
bumped to version 4.25.0
2015-04-17 16:32:11 +06:00
Nabin Hait
4743cbe002
issue fixed in accounts receivable report
2015-04-17 15:55:19 +05:30
Nabin Hait
ddaedefb32
minor fix for fieldname
2015-04-17 15:01:41 +05:30
Rushabh Mehta
9e6812cfab
Merge pull request #3108 from BhupeshGupta/fix_bank_reports
...
Add/Fix Bank Reports Filters
2015-04-17 14:17:22 +05:30
Nabin Hait
2ba88c4a5f
patch: delete gle for cancelled invoices
2015-04-17 12:05:00 +05:30
Rushabh Mehta
b092339c3a
[minor] ignore list for dropbox
2015-04-17 12:01:40 +05:30
Rushabh Mehta
0939a5ac4c
feature to delete company
2015-04-17 11:52:45 +05:30
Anand Doshi
63ea99e929
[hotfix] item group set_parent_website_route
2015-04-16 20:45:54 -04:00
Nabin Hait
1a6299176a
delete gl entries on cancellation of sales invoice, if grand total is zero
2015-04-16 19:22:42 +05:30
Nabin Hait
2029ea9abf
toggle editable price list rate
2015-04-16 17:55:35 +05:30
Nabin Hait
2182cd5487
Update journal_entry.js
2015-04-16 16:00:37 +05:30
Rushabh Mehta
acf489c5ef
[hot] [fix] journal entry
2015-04-16 15:35:49 +05:30
Rushabh Mehta
d839a730cf
[hot] [fix] journal entry
2015-04-16 15:27:46 +05:30
Rushabh Mehta
5674c4f28c
[splash] new image
2015-04-16 15:09:42 +05:30
Rushabh Mehta
d64e928b50
[favicon] darker
2015-04-16 14:04:51 +05:30
Nabin Hait
c3daa91c8a
Reset no-copy fields for recurring docs and patch to fix
2015-04-16 13:13:18 +05:30
Rushabh Mehta
2e7c36ec99
[favicon] light grey for erpnext
2015-04-16 12:41:42 +05:30
Rushabh Mehta
600aa622b1
[fix] [minor] journal entry, via error report
2015-04-16 11:43:26 +05:30
Rushabh Mehta
12ade3573b
[minor] fix default permissions for purchase taxes and charges master
2015-04-16 11:43:25 +05:30
bhupeshg2
3f59615555
switch to tabs
2015-04-15 22:29:45 +05:30
Rushabh Mehta
2887913797
[fix] opportunity -> quotation
2015-04-15 15:40:05 +05:30
Rushabh Mehta
2dea40f7be
[leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042
2015-04-15 15:08:48 +05:30
Pratik Vyas
850ee3c53d
Fix make_email_account patch
2015-04-15 14:36:32 +05:30
Rushabh Mehta
53bc304be2
Merge pull request #3037 from neilLasrado/production-planning
...
Production planning
2015-04-15 12:06:44 +05:30
Rushabh Mehta
e027d3f34f
[fix] a better solution for #2776
2015-04-15 12:03:21 +05:30
bhupeshg2
e2e973f7be
Add reqd to bank clearance aummary report
...
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
2015-04-14 23:09:32 +05:30
Anand Doshi
68dfc934bf
[hotfix] [report] Received Items to be Billed
2015-04-14 11:56:42 -04:00
Rushabh Mehta
3ee1f11771
[cleanup] quality inspection fixes #3061
2015-04-14 17:53:36 +05:30
Rushabh Mehta
5e7f8fd156
[ux] bom fixes #3072
2015-04-14 14:24:21 +05:30
Rushabh Mehta
de9bd108d0
[usability] journal entry type fixes #3085
2015-04-14 14:10:19 +05:30
Rushabh Mehta
39539f14ce
[patch-fix] make_email_accounts
2015-04-14 13:07:28 +05:30
Neil Trini Lasrado
18dc151fc7
Fixes in make_time_log function in Production Order
2015-04-14 13:06:07 +05:30
Neil Trini Lasrado
cf96cc26a0
Fixes for test cases
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
1371afce2e
added default date to planned start date in Prod Order & made planned end date read-only
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
c43ac20115
Fixes in logic for production order scheduling
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
d3d94d1efe
fix- Material Transferred for Manufacturing not Updating in Production Order Error
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
cd1816cc5a
removed unnecesssary functions. Production related feilds made mandatory in TIme Log
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
5ab7d930b6
make time log button in Production order operations fixed
...
show time logs button made available for compleated operations
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
8d5d5cc0a7
Planned Start Date made mandatory in production order
...
server side check added to not plan operations if planned_start_date is None
Production Order on submit - unwanted error messsages problem fixed.
2015-04-14 13:00:54 +05:30
Rushabh Mehta
2c78796716
[fix] opportunity / make quotation
2015-04-14 11:24:42 +05:30
Rushabh Mehta
adfc34ba00
[opportunity] status open
2015-04-13 22:23:50 +05:30
Rushabh Mehta
f579cf9871
[opportunity] status open
2015-04-13 16:58:47 +05:30
Rushabh Mehta
4ac3094049
[opportunity] status open
2015-04-13 16:56:03 +05:30
Rushabh Mehta
c712dc6729
[opportunity] status open
2015-04-13 16:51:27 +05:30
Rushabh Mehta
99a4d63d97
[opportunity] status open
2015-04-13 16:24:35 +05:30
Rushabh Mehta
fd0f1cb8b7
[opportunity] not submittable
2015-04-13 16:21:58 +05:30
Rushabh Mehta
20bcf6aeff
[fixes] print_hide on stock uom and gross profit
2015-04-13 15:31:24 +05:30
Rushabh Mehta
39c84fe31c
[hot] coa
2015-04-13 12:16:25 +05:30
Rushabh Mehta
b4c4351513
[report] fix via error report
2015-04-13 11:30:10 +05:30
Pratik Vyas
2437d4cce2
Fix #3046 Customer Acquisition and Loyalty repor
2015-04-10 12:35:43 +05:30
Pratik Vyas
7f8cc32d38
update translations
2015-04-10 10:26:08 +05:30
Anand Doshi
a0630671da
[hotfix] batch query
2015-04-09 13:34:57 +05:30
Pratik Vyas
c95e4e89d5
bumped to version 4.24.4
2015-04-09 12:56:05 +06:00
Nabin Hait
4642d0697e
fixed conflict
2015-04-09 11:42:24 +05:30
Anand Doshi
00a07de426
fixed test earning type
2015-04-08 21:49:11 +05:30
Anand Doshi
c994647704
fixed test cases
2015-04-08 21:22:36 +05:30
Anand Doshi
2f87fb41fa
Merge pull request #3069 from neilLasrado/dob
...
validation added - dob cannot accept a future date
2015-04-08 13:25:01 +05:30
Anand Doshi
a1a3468704
Merge pull request #3068 from neilLasrado/leaves
...
Bug Fixes
2015-04-08 13:20:18 +05:30
Neil Trini Lasrado
4b29ccc2b0
Salary Structure - Earnings made mandatory
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef
fix - update button didnt work in leave allocation after submit
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515
validation added - dob cannot accept a future date
2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b
fixes in offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a
print format added
2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513
[fixes] offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2
terms view added
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168
Offer Letter - New Doctype added and job_applicant naming changed
2015-04-08 12:28:20 +05:30
Nabin Hait
0277ae298a
pending amount to be delivered in report
2015-04-07 17:49:53 +05:30
Pratik Vyas
d102cba71c
[patch] [fix] Fix missing image column error
2015-04-07 15:32:15 +05:30
Anand Doshi
e4e112a6bc
setup wizard - don't send welcome mail
2015-04-07 11:03:58 +05:30
Nabin Hait
6eb55d4d3d
allowed import for delivery note
2015-04-07 09:42:44 +05:30
Anand Doshi
03cf407574
[fix] removed print
2015-04-06 19:38:13 +05:30
Anand Doshi
c399709789
fixes to test cases
2015-04-06 19:29:16 +05:30
Anand Doshi
0dc79f4de0
Merge remote-tracking branch 'frappe/v4.x.x' into develop
...
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
2015-04-06 13:21:07 +05:30
Anand Doshi
731b15edf4
[hotfix] taxes and totals
2015-04-05 20:09:09 +05:30
Anand Doshi
22af7deadd
minor fixes
2015-04-05 17:18:07 +05:30
Anand Doshi
7854779c22
[hotfix] strip email when importing newsletter list
2015-04-05 13:44:52 +05:30
Anand Doshi
e4580447d0
[fix] on setup wizard language selection and load, set it as system default language
2015-04-04 16:15:04 +05:30
Anand Doshi
85e5d46370
[fix] opportunity email pulling
2015-04-03 15:03:01 +05:30
Anand Doshi
c13c4f014e
[fix] editable amount in Purchase Taxes and Charges
2015-04-03 14:55:51 +05:30
Anand Doshi
432c12ad93
[fix] email account patch fix and minor setup wizard fix
2015-04-03 14:30:15 +05:30
Rushabh Mehta
8bd54f27c5
Merge pull request #3051 from rmehta/opportunity
...
Opportunity
2015-04-03 11:01:59 +05:30
Rushabh Mehta
f63a3d4a80
[fiscal year] automatically set year end date if more than one year
2015-04-03 10:59:48 +05:30
Anand Doshi
9d3adc3abf
Merge pull request #3048 from anandpdoshi/anand-april-2-v5
...
Party Model Patch
2015-04-03 08:22:59 +05:30
Rushabh Mehta
bb2041d22c
[patch] fix
2015-04-02 22:11:16 +05:30
Rushabh Mehta
7c32770a69
move opportunity item to CRM
2015-04-02 22:06:36 +05:30
Rushabh Mehta
3c626faf8f
[incoming sales email] to opportunity
2015-04-02 22:02:33 +05:30
Rushabh Mehta
4c46687fb1
[incoming sales email] to opportunity
2015-04-02 22:00:34 +05:30
Rushabh Mehta
05e39992d0
[setup-wizard] don't catch duplicate
2015-04-02 18:55:36 +05:30
Anand Doshi
5445c460b7
[fix] [patch] party model patch
2015-04-02 17:42:27 +05:30
Rushabh Mehta
750ceedbc1
[production order] explict idx + test fix
2015-04-02 16:03:11 +05:30
Rushabh Mehta
99a41952a4
[lead] [email] fixes
2015-04-02 15:53:11 +05:30
Anand Doshi
54448aabd6
Setup wizard fixes
2015-04-02 15:39:44 +05:30
Rushabh Mehta
ffc190d34d
Merge pull request #3013 from neilLasrado/expense
...
Expense Claim - 'Total Amount Reimbursed' feild added
2015-04-02 14:29:29 +05:30
Anand Doshi
83f87da3d1
Show Write-Off for all Sales Invoices if there is a Grand Total
2015-04-02 13:43:51 +05:30
Rushabh Mehta
d7a5b7309b
[minor] fix
2015-04-01 23:38:37 +05:30
Anand Doshi
bfa3a08576
fixed welcome emails
2015-04-01 23:34:16 +05:30
Anand Doshi
3aaab1a39e
setup wizard fixes
2015-04-01 22:01:54 +05:30
Rushabh Mehta
99d90e1f34
[setup] send welcome emails after setup
2015-04-01 20:32:57 +05:30
Anand Doshi
7b6daafbb9
[minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person
2015-04-01 16:26:59 +05:30
Anand Doshi
8ea1ed143b
Show write-off section if pos or advance payment
2015-04-01 16:25:55 +05:30
Rushabh Mehta
4c8d01ba9e
[issue] close, reopen buttons
2015-04-01 15:43:14 +05:30
Rushabh Mehta
918ddf2537
[task] open, close from list:
2015-04-01 15:43:14 +05:30
Anand Doshi
ee57a8d2a4
[hotfix] unique job applicant
2015-04-01 12:29:30 +05:30
Anand Doshi
dd77287cb9
[fix] fiscal year auto-create
2015-04-01 08:26:32 +05:30
Anand Doshi
5745cf7600
fixed rename field patches
2015-03-31 17:31:53 +05:30
Anand Doshi
92af795f12
Fixed note permission query
2015-03-31 14:42:22 +05:30
Rushabh Mehta
aefc01372f
[listview] issue: open, close | so, po: stop, unstop
2015-03-31 13:39:42 +05:30
Anand Doshi
fc79492bac
Lead Status in List, minor fix in Make Email Accounts patch
2015-03-30 22:35:51 +05:30
Anand Doshi
d6a360b51b
[fix] check job application unique email id
2015-03-30 21:11:34 +05:30
Pratik Vyas
4ec1a9e8f6
Move frappe field renames to frappe
2015-03-30 19:37:02 +05:30
Sambhaji Kolate
a4fa96cc79
some fix in batch related cleanup
2015-03-30 16:04:55 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Pratik Vyas
10224c9d86
bumped to version 4.24.3
2015-03-30 13:11:48 +06:00
Anand Doshi
adcf857c37
fixed newsletter unsubscribe and default footer
2015-03-27 17:42:18 +05:30
Nabin Hait
54c865e77c
Landed cost voucher: fixes for serialized item
2015-03-27 15:39:06 +05:30
Nabin Hait
f977ad036e
reload block module
2015-03-27 10:49:41 +05:30
Nabin Hait
e5604dc944
production order operation order by idx
2015-03-26 17:40:57 +05:30
Nabin Hait
789ef7e346
stock balance report fixed
2015-03-26 17:40:57 +05:30
Neil Trini Lasrado
a6b3415cdd
Expense Claim - 'Total Amount Reimbursed' feild added
2015-03-26 14:13:44 +05:30
Nabin Hait
7057970c0c
purchase order items to be billed report
2015-03-26 11:05:13 +05:30
Rushabh Mehta
eb928b950f
[fix] journal entry 3 cols, default weekly digest
2015-03-25 17:34:20 +05:30
Nabin Hait
d25fda7537
patch fixes
2015-03-25 15:55:09 +05:30
Nabin Hait
06b0b36ae6
Patch fixes
2015-03-25 14:51:35 +05:30
Anand Doshi
d3a32bc9e5
[minor] fixed newsletter patch
2015-03-25 14:51:11 +05:30
Nabin Hait
37eaa0cca3
Merge pull request #3003 from neilLasrado/activity-type
...
time_log_for select field in TL changed to against_manufacturing (check)
2015-03-24 18:03:25 +05:30
Neil Trini Lasrado
3fcd89f63e
against_manufacturing renamed to for_manufacturing
2015-03-24 17:51:31 +05:30
Rushabh Mehta
308e6ea21e
[fixes] default_website and stock reco
2015-03-24 17:35:16 +05:30
Nabin Hait
b6061e5d3f
deleted chart of accounts and style settings doctype
2015-03-24 17:11:58 +05:30
Neil Trini Lasrado
bccec29415
In Time Log
...
- time_log_for removed.
- against manufacturing check box introduced
- all logic depending time_log_for shifted to against_manufacturing
- activity type made non-mandatory
- fixes in operations select feild data population in Time log
In Activity Type
- Validations for activity type manufacturing removed.
- Patch for creating activity type manufacturing removed
- activity type manufacturing removed from install fixtures
2015-03-24 16:53:54 +05:30
Nabin Hait
a3eec1603a
fixed against jv query
2015-03-24 14:49:09 +05:30
Nabin Hait
53450b08b0
Fixes in general ledger report
2015-03-24 13:13:25 +05:30
Nabin Hait
03f7a8e44a
minor fix in newsletter patch
2015-03-24 11:58:21 +05:30
Nabin Hait
e9d83303d3
create manufacturing activity type via patch only if setup completed
2015-03-23 17:05:32 +05:30
Nabin Hait
d2af60c825
Root Equity added in standard chart of accounts and finalized chart of India And UAE
2015-03-23 16:08:32 +05:30
Rushabh Mehta
04f907efcf
[fix] job applicant (test via import)
2015-03-23 15:44:54 +05:30
Rushabh Mehta
fea22de3e8
[minor] material request and newsletter list
2015-03-23 15:44:54 +05:30
Nabin Hait
da5cfb1630
Exchange rate upto 9 decimals
2015-03-23 14:51:45 +05:30
Nabin Hait
3c89605e57
minor fix in taxes and totals
2015-03-23 14:33:22 +05:30
Nabin Hait
ca7e778f82
modified date updated
2015-03-23 14:17:59 +05:30
Rushabh Mehta
c2eae25d0e
[cleanup] validate_email_add
2015-03-23 14:10:51 +05:30
Nabin Hait
97cc4dd582
precision issue fixed in report
2015-03-23 13:10:50 +05:30
Nabin Hait
395724dcdb
Merge pull request #2988 from neilLasrado/make-quote
...
make quotation button added to lead
2015-03-23 12:52:09 +05:30
Nabin Hait
544af6d4cf
fix
2015-03-23 12:35:39 +05:30
Neil Trini Lasrado
bef6fa152e
make quotation button added to lead
2015-03-23 11:01:22 +05:30
Pratik Vyas
e07e5bbe00
bumped to version 4.24.2
2015-03-20 18:02:07 +06:00
Nabin Hait
63e00dcfd2
Set qty as per stock_uom while mapping Material request to Purchase order
2015-03-20 16:25:53 +05:30
Rushabh Mehta
aca5c7b580
[test] newsletter list
2015-03-20 16:06:34 +05:30
Rushabh Mehta
208a06f5f5
[test] newsletter list
2015-03-20 15:57:25 +05:30
Rushabh Mehta
acdd5189d1
[test-fix]
2015-03-20 15:52:11 +05:30
Rushabh Mehta
288a833422
[test-fix]
2015-03-20 15:37:31 +05:30
Rushabh Mehta
a7c377887b
[test-fix]
2015-03-20 15:15:38 +05:30
Nabin Hait
2ed71bac20
Batch related cleanup
2015-03-20 15:06:30 +05:30
Rushabh Mehta
8f343165ad
[patch-fix] convert_stock_reco
2015-03-20 15:04:13 +05:30
Nabin Hait
5601d9fbda
match condition in get_query
2015-03-20 14:40:36 +05:30
Rushabh Mehta
a7e21eb484
[newsletter-list] fixes, patch fix
2015-03-20 14:38:12 +05:30
Anand Doshi
2b2b639492
fixes
2015-03-20 14:29:23 +05:30
Nabin Hait
c1199c0d27
minor fix in patch
2015-03-20 10:29:30 +05:30
Rushabh Mehta
611b513a2d
[newsletter] fixed tests
2015-03-19 17:16:03 +05:30
Rushabh Mehta
14ae4c3603
[email] many fixes, newsletter, unsubscribe
2015-03-19 17:16:03 +05:30
Nabin Hait
fd2bf93b50
test case fix
2015-03-18 17:56:09 +05:30
Anand Doshi
9d8154dd40
fixed test cases
2015-03-18 16:22:13 +05:30
Nabin Hait
60aee54c6c
currency in test records
2015-03-18 16:06:13 +05:30
Nabin Hait
2df422de25
Test case fixes
2015-03-18 14:57:09 +05:30
Nabin Hait
87ee502dfd
Merge pull request #2949 from sbktechnology/develop
...
update get_batch_no query to sort batch with expiry date
2015-03-18 14:29:13 +05:30
Nabin Hait
b48fd9dfa9
Merge pull request #2965 from neilLasrado/serial-no
...
fixes in get_serial_number function
2015-03-18 14:26:14 +05:30
Neil Trini Lasrado
adb1b2ccef
fix - price list none is disabled error if price list is made blank in purchase order
2015-03-18 11:41:58 +05:30
Neil Trini Lasrado
3d61bbb36a
fixes in get_serial_number function
2015-03-18 11:04:32 +05:30
Anand Doshi
3353ad42bc
setup wizard bounce animation when working
2015-03-17 12:45:44 +05:30
Pratik Vyas
52c5121ecd
change version to v5.0.0-beta
2015-03-17 11:22:16 +05:30
Nabin Hait
a1bf43b1a6
Merged develop into v5
2015-03-17 10:50:47 +05:30
Nabin Hait
d3fd8965de
test case fixed
2015-03-17 10:15:19 +05:30
Pratik Vyas
ec25117ab0
bumped to version 4.24.1
2015-03-16 22:08:30 +06:00
Anand Doshi
5b73da99d6
[minor] fixed patch
2015-03-16 17:10:28 +05:30
Nabin Hait
f2791f8898
manipulate_grand_total_for_inclusive_tax
2015-03-16 17:01:09 +05:30
Anand Doshi
ead48094b6
manipulate diff only if diff <= 0.02
2015-03-13 18:59:01 +05:30
Anand Doshi
d6822ddd7c
manipulate grand total for inclusive tax
2015-03-13 18:23:10 +05:30
Anand Doshi
9d9e31f4e8
moved get_list_context to module
2015-03-13 12:48:05 +05:30
Pratik Vyas
2e5be6f994
Merge pull request #2955 from neilLasrado/v5.0
...
patch rename
2015-03-13 11:46:14 +05:30
Neil Trini Lasrado
14543169b4
patch rename
2015-03-13 11:43:52 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Nabin Hait
c8c1d1c693
Test case fixes
2015-03-13 08:14:45 +05:30
Nabin Hait
15e4833785
Merge pull request #2943 from neilLasrado/time-log
...
bug fix - show time log in production order operations
2015-03-12 17:53:16 +05:30
Nabin Hait
53ea6fa686
Merge pull request #2944 from neilLasrado/po
...
fixes in Production Order
2015-03-12 17:52:59 +05:30
Neil Trini Lasrado
76d3a6c2ba
bug fix - show time log in production order operations
2015-03-12 17:51:50 +05:30
Neil Trini Lasrado
6f272f2f53
fixes in Production Order
2015-03-12 17:51:06 +05:30
Neil Trini Lasrado
c6dfb02e4a
mend
2015-03-12 16:15:36 +05:30
Neil Trini Lasrado
e7044fa0f6
validation added to check if multiple sales person have been given the same employee id
2015-03-12 16:15:03 +05:30
Nabin Hait
1ca0b74e03
Merge pull request #2945 from neilLasrado/workstation
...
warehouse removed from workstation master
2015-03-12 16:13:47 +05:30
Nabin Hait
9ac71c0b17
Merge pull request #2935 from neilLasrado/po-fix
...
Bug fixes in Production Order
2015-03-12 16:07:21 +05:30
Sambhaji Kolate
feff40a930
update get_batch_no query to sort batch with expiry date
...
small fix to avoid error msg if item_code not selected and batch_no is entered
2015-03-11 11:50:28 +05:30
Anand Doshi
838ba02d34
setup wizard image fix
2015-03-10 19:15:49 +05:30
Sambhaji Kolate
845f1c636e
code cleanup
2015-03-10 15:19:29 +05:30
Neil Trini Lasrado
2c25a4396f
warehouse removed from workstation master
2015-03-10 15:15:54 +05:30
Sambhaji Kolate
98dbccd1d6
added actual_batch_qty at warehouse in DN & SI #1873
2015-03-10 15:04:28 +05:30
Pratik Vyas
21761c204c
bumped to version 4.24.0
2015-03-10 11:11:35 +06:00
Nabin Hait
11498cac94
Repost sle for si without warehouse
2015-03-09 18:28:35 +05:30
Nabin Hait
7a31f6aaca
repost reserved qty if negative
2015-03-09 16:31:11 +05:30
Rushabh Mehta
f5f0d5a83a
[breadcrumbs] refactor
2015-03-09 15:48:16 +05:30
Anand Doshi
ecd2e0f386
Setup Wizard: catch duplicate entry error
2015-03-09 15:42:52 +05:30
Neil Trini Lasrado
42556dfab9
fixes-in-production-order
2015-03-09 15:35:24 +05:30
Nabin Hait
081c3ec476
c-form message issue
2015-03-09 15:11:34 +05:30
Nabin Hait
e2f054cc27
transaction date issue in pricing rule fixed
2015-03-09 14:54:37 +05:30
Pratik Vyas
6fbb25bf9d
update translations
2015-03-08 21:29:59 +05:30
Anand Doshi
c0eb8c0de3
Fixed some Stock Entry test cases
2015-03-08 12:42:18 +05:30
Anand Doshi
1119fb4c00
Fixed Sales Invoice test cases
2015-03-06 20:50:51 +05:30
Anand Doshi
e514323be4
load all js and css like before in desk.html
2015-03-06 13:17:26 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Rushabh Mehta
06a6bcce17
[fixes] pos, chart of accounts
2015-03-05 16:38:43 +05:30
Rushabh Mehta
c4dce99f4b
[fixes] pos #2830 , #2795
2015-03-05 15:09:04 +05:30
Rushabh Mehta
b888359b45
Merge pull request #2886 from neilLasrado/bom_test_records
...
text records fixed in bom
2015-03-05 10:57:33 +05:30
Nabin Hait
b50833a1e8
Fields alignment
2015-03-04 16:14:02 +05:30
Nabin Hait
95ff2d4fed
discount loss adjustment in base currency
2015-03-04 16:02:21 +05:30
Rushabh Mehta
31724da2d6
[print] item qty & uom on same line
2015-03-04 15:51:08 +05:30
Nabin Hait
25bd84dfcc
Discount amount loss adjustment if no taxes or discount applied on net total
2015-03-04 15:07:17 +05:30
Rushabh Mehta
0c677aa151
fix #2847
2015-03-04 12:32:59 +05:30
Nabin Hait
652c7db6e8
Stock entry fixes: incoming rate, toggle display of bom related fields
2015-03-03 18:33:34 +05:30
Nabin Hait
57a5c71663
Update rate in exploded_items on click of update cost btton
2015-03-03 18:27:21 +05:30
Rushabh Mehta
2cc585f180
[git fixes] salary manager, time log title, notificaitons
2015-03-03 16:06:54 +05:30
Rushabh Mehta
e693f794f5
[subcontract] refactor, make stock entry from PO
2015-03-03 15:50:24 +05:30
Nabin Hait
49ecbd7353
Sales invoice query in journal entry
2015-03-03 15:48:33 +05:30
Nabin Hait
56c6a65a22
argument name fix in sendmail
2015-03-03 15:48:33 +05:30
Nabin Hait
fcda00f317
Activity spelling correction
2015-03-03 15:48:33 +05:30
Nabin Hait
81b8d7597d
bom with operations activity
2015-03-03 15:48:33 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
43ba7e1a30
allow negative stock issie fixed
2015-03-03 14:07:21 +05:30
Nabin Hait
786472279a
salary slip calculation: trigger on
2015-03-03 14:07:21 +05:30
Nabin Hait
c7aba3331b
verified chart of accounts
2015-03-03 14:07:21 +05:30
Rushabh Mehta
1758357a0a
[item] toggle reqd, fixes #2832
2015-03-03 11:08:22 +05:30
Pratik Vyas
593d56265f
update translations
2015-03-02 19:11:14 +05:30
Rushabh Mehta
c37281e59c
Merge pull request #2897 from neilLasrado/job-application
...
job application fixed
2015-03-02 19:01:16 +05:30
Neil Trini Lasrado
96bc31db27
job application fixed
2015-03-02 18:54:45 +05:30
Rushabh Mehta
910ba02f49
Merge pull request #2896 from neilLasrado/employee-report
...
employee information report fix
2015-03-02 18:31:47 +05:30
Rushabh Mehta
9bb42359d8
Merge pull request #2895 from neilLasrado/appraisal
...
Fixes in Appraisal doc
2015-03-02 18:30:52 +05:30
Rushabh Mehta
c33a81c536
[production order] from_bom issue fixes #2879
2015-03-02 18:27:03 +05:30
Rushabh Mehta
b83fa3bc2d
[pos] [barcode] fixes #2831
2015-03-02 18:25:14 +05:30
Neil Trini Lasrado
71a651ec21
employee information report fix
2015-03-02 18:13:25 +05:30
Neil Trini Lasrado
fd0920fe83
Fixes in Appraisal doc
2015-03-02 17:33:48 +05:30
Rushabh Mehta
8c84fca182
[fix] #2875
2015-03-02 16:29:56 +05:30
Rushabh Mehta
3384cb7e63
[fix] #2836
2015-03-02 16:20:23 +05:30
Rushabh Mehta
00e3b26597
[fix] rename tool #2861
2015-03-02 15:05:36 +05:30
Rushabh Mehta
905f8328ab
cleanup global defaults, fix #2838 :
2015-03-02 13:01:39 +05:30
Neil Trini Lasrado
5cbd12e4e5
text records fixed in bom
2015-03-02 10:53:12 +05:30
Anand Doshi
16018dd474
removed erpnext splash
2015-03-01 21:16:44 +05:30
Nabin Hait
86cd4cc739
discount related fix
2015-02-28 19:12:55 +05:30
Nabin Hait
bc6c360bf1
Update accounts_controller.py
2015-02-27 23:40:56 +05:30
Nabin Hait
ad7ece63fe
Update sales_invoice.py
2015-02-27 22:45:28 +05:30
Nabin Hait
b7ae9b4283
Merge pull request #2866 from neilLasrado/barcode
...
Barcode added to stock entry
2015-02-27 11:35:07 +05:30
Anand Doshi
8f9e631a44
minor fixes
2015-02-26 20:29:43 +05:30
Pratik Vyas
8462f4ad2c
bumped to version 4.23.0
2015-02-26 15:16:43 +06:00
Pratik Vyas
add4c96280
Merge pull request #2871 from anandpdoshi/anand-feb-26
...
Fixes in queries and translations
2015-02-26 14:43:27 +05:30
Anand Doshi
45b5da0826
[translations] removed translations that have missing placeholders like {0}
2015-02-26 13:34:24 +05:30
Pratik Vyas
c452b4b7cc
bumped to version 4.22.2
2015-02-26 13:57:41 +06:00
Anand Doshi
335763da49
updated translations
2015-02-26 13:20:15 +05:30
Anand Doshi
5bd8cfd9fe
[fix] queries
2015-02-26 12:40:58 +05:30
Nabin Hait
851c745fdf
Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0
2015-02-26 12:32:04 +05:30
Nabin Hait
8be6939288
help description for party account
2015-02-26 12:31:07 +05:30
Nabin Hait
836f9f34e4
warehouse mandatory in sales invoice if update_stock
2015-02-26 11:40:20 +05:30
Nabin Hait
98a8fae7c2
hotfix for fetching default account and warehouse
2015-02-26 11:37:07 +05:30
Neil Trini Lasrado
4374692cf5
fixes
2015-02-25 19:01:17 +05:30
Neil Trini Lasrado
4abda67a98
Barcode added to stock entry
2015-02-25 19:01:17 +05:30
Anand Doshi
e474aa5d91
[minor] Product grid text-ellipsis
2015-02-25 18:52:22 +05:30
Nabin Hait
69d874e7d7
Merge pull request #2864 from neilLasrado/delivery-note
...
Delivery note - Batch Id made Link Feild
2015-02-25 18:37:17 +05:30
Nabin Hait
79ffc2b3a7
fix in financial statements
2015-02-25 18:32:25 +05:30
Rushabh Mehta
a8a2fb225d
[fixes] item, test site install
2015-02-25 17:32:22 +05:30
Rushabh Mehta
66a92792b4
[fix] default account for manufacturing stock entry should be cogs
2015-02-25 17:15:45 +05:30
Rushabh Mehta
8f62e2448c
[fix] patches
2015-02-25 16:28:33 +05:30
Rushabh Mehta
6cdfd1e976
[fix] patches
2015-02-25 15:55:57 +05:30
Rushabh Mehta
2a21bc9fc2
[taxes and charges] refactor
2015-02-25 15:08:57 +05:30
Rushabh Mehta
e91388381c
[minor] notifications and other fixes to stock
2015-02-25 15:08:57 +05:30
Anand Doshi
d75ef108fc
Allow user to change page_name in Item and Item Group #2397
2015-02-25 13:50:14 +05:30
Neil Trini Lasrado
b9ff7186ed
batch field changed to link feild in packed_item
2015-02-25 12:44:45 +05:30
Anand Doshi
28d21ba3c0
[minor] fix build.json
2015-02-24 22:28:26 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Anand Doshi
da858cc587
Website Product Image
2015-02-24 17:52:09 +05:30
Nabin Hait
93b3a37a3b
rounding issue and rate trigger
2015-02-24 17:08:51 +05:30
Rushabh Mehta
b620fed762
[fixes] [minor]
2015-02-24 16:51:22 +05:30
Nabin Hait
7ce2f55ca9
print_hide for total_taxes_and_charges in buying
2015-02-24 16:06:14 +05:30
Nabin Hait
72c359afa2
valuation type charges can not be inclusive
2015-02-24 16:05:19 +05:30
Nabin Hait
903c42a130
multiplefixes
2015-02-24 15:24:49 +05:30
Rushabh Mehta
99d0941008
[time logs] fixes
2015-02-24 14:48:11 +05:30
Nabin Hait
9524ee7ec6
tax amount in print
2015-02-24 14:43:14 +05:30
Nabin Hait
d5616cd977
reload journal entry on patch
2015-02-24 13:12:13 +05:30
Nabin Hait
b923f8a78b
project milestone patch fix
2015-02-24 13:05:49 +05:30
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
