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
