Nabin Hait
17378e8a29
Added a new column for Credit/Debit Note in AR/AP report ( #9123 )
2017-06-07 11:56:53 +05:30
Manas Solanki
b76b4f40a0
Added mode of transport in program enrollment ( #9124 )
2017-06-07 11:56:26 +05:30
Prateeksha Singh
3a18dea8a4
[fix][multiselect] don't show completed PRECs for a PINV ( #9125 )
2017-06-07 11:55:25 +05:30
Makarand Bauskar
db8363e9eb
[minor] check serial no filedtype before updating ( #9126 )
...
* Update serial_no.py
Takes care of Different FieldTypes
* [minor] check serial no filedtype before updating
2017-06-07 11:54:26 +05:30
Manas Solanki
214e6906e5
Addition of field 'group based on' in the student attendance tool ( #9152 )
2017-06-07 11:53:41 +05:30
Manas Solanki
39adfb52f3
Naming in the assessment plan ( #9153 )
2017-06-07 11:52:36 +05:30
rohitwaghchaure
ce6e621c18
[fix] Not able to cancel the invoice if it's linked with the timesheet ( #9157 )
2017-06-07 11:52:04 +05:30
Manas Solanki
2a0d650735
fix in the report ( #9167 )
2017-06-07 11:29:27 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Ben Cornwell-Mott
70fe968f02
Fixed some errors
2017-06-04 20:19:59 -07:00
Ben Cornwell-Mott
a3aa6a4449
Changed Explosion Item as well
2017-06-02 16:54:03 -07:00
Makarand Bauskar
c196d740e5
[minor] added filter for batch no field in purchase transaction ( #9038 )
...
* [minor] added filter for batch no field in purchase transaction
* [minor] filter the batch based on item_code instead of get_batch_no method
* [minor] filter based on item_code for Purchase Invoice with update stock
2017-06-02 17:28:40 +05:30
Nabin Hait
5b8b4dcce1
Merge branch 'master' into develop
2017-06-02 14:05:54 +05:30
Nabin Hait
52e443cfc8
bumped to version 8.0.44
2017-06-02 14:35:53 +06:00
Nabin Hait
ae07f22d8b
Fixed syntax error
2017-06-02 13:57:16 +05:30
Nabin Hait
02d282f347
Merge branch 'master' into develop
2017-06-01 19:09:37 +05:30
Nabin Hait
1091a25491
bumped to version 8.0.43
2017-06-01 19:39:36 +06:00
Britlog
495a408db0
Fix contact form if email is both customer and lead ( #9075 )
2017-06-01 19:08:04 +05:30
Charles-Henri Decultot
5ade661a9a
Weekly digest subject translation ( #9003 )
2017-06-01 19:06:32 +05:30
ahmadRagheb
c4d2bab5b3
Arabic language shows Errors onSubmit in maintenance_schedule ( #9082 )
...
* Arabic language shows Errors onSubmit in maintenance_schedule
when trying to submit using arabic language error show up ,
i replace this way of formating arguments
description = frappe._("Reference: %s, Item Code: %s and Customer: %s") % \
(self.name, d.item_code, self.customer)
to new one :description = frappe._("Reference: %s, Item Code: %s and Customer: %s").format(self.name, d.item_code, self.customer)
and it solve the problem on my local
* Arabic language shows Errors onSubmit in maintenance_schedule
* Arabic language shows Errors onSubmit in maintenance_schedule
2017-06-01 19:06:00 +05:30
Frappe PR Bot
59ee45a1a5
[translation] translation updates ( #9081 )
2017-06-01 19:05:28 +05:30
Ashwini Save
2020dd37e8
Fixed issue : Payment Entry allocating amount more than invoice amount. ( #9084 )
...
* Fixed issue : Payment Entry allocating amount more than invoice amount.
* Added condition to solve issue when allocated amount is null
* Code review Changes for payment entry
2017-06-01 19:00:34 +05:30
Faris Ansari
9f6d024260
Set website route field as No Copy field ( #9106 )
...
* Set website route field as No Copy field
* minor
2017-06-01 18:58:07 +05:30
rohitwaghchaure
7f2513f7a1
[Fix] Employees working on a holiday report's date filter not working ( #9108 )
2017-06-01 18:57:34 +05:30
Manas Solanki
f60bd60012
Fix the demo for the schools ( #8879 )
...
* Fix the demo for the schools
* Fix for the demo
https://github.com/frappe/erpnext/issues/6347
2017-06-01 18:30:35 +05:30
Nabin Hait
e4b3a67e74
Rate validation in return entry
2017-06-01 16:47:45 +05:30
Manas Solanki
f02c82aeca
Fixes in the patch ( #9027 )
...
* fix in the patch
* new patch for student groups
* changes in the merge student batch patch
2017-06-01 13:08:27 +05:30
tundebabzy
cf92be88b7
[minor] fixes typo ( #9093 )
2017-05-31 13:21:12 +05:30
Nabin Hait
fa16b849a0
Merge branch 'master' into develop
2017-05-30 22:52:39 +05:30
Nabin Hait
f2c374f524
bumped to version 8.0.42
2017-05-30 23:22:38 +06:00
mbauskar
26044f436a
[minor] fixed a unexpected token error for opportunity
2017-05-30 22:28:08 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Nabin Hait
93b5367485
bumped to version 8.0.41
2017-05-30 16:29:04 +06:00
Manas Solanki
5995010007
Correction in the validation message ( #9079 )
2017-05-30 15:56:48 +05:30
bcornwellmott
0d38a6b495
Fix grammar error in HR Training Results ( #9076 )
...
* Fix Typo in message
Issue #9074
* Added condition for notifying user of grade.
2017-05-30 15:56:02 +05:30
Manas Solanki
a85b68ee77
link for timesheet, fix https://github.com/frappe/erpnext/issues/9042 ( #9071 )
2017-05-30 15:55:00 +05:30
Manas Solanki
ca31425bb4
field for the naming series should have no copy attribute ( #9067 )
2017-05-30 15:36:50 +05:30
Manas Solanki
253c53cf53
updating serial no status from scheduler #9061 ( #9066 )
2017-05-30 15:35:58 +05:30
Nabin Hait
ac3b2aa913
Set change amount automatically only if it is a cash transaction ( #9065 )
2017-05-30 15:35:01 +05:30
Nabin Hait
5d7e8d9e83
Minor fix in timesheet ( #9063 )
2017-05-30 15:34:35 +05:30
Nabin Hait
6a5cf672c1
Fixed opportunity status ( #9062 )
2017-05-30 15:34:20 +05:30
Manas Solanki
5f7b88d9c3
set student roll no in backend if not given ( #9039 )
2017-05-30 15:33:50 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Faris Ansari
dae7721384
Merge pull request #8975 from almeidapaulopt/milestones
...
Milestones in Project Gantt
2017-05-29 10:58:35 +05:30
Nabin Hait
6a541a6f7a
Merge branch 'master' into develop
2017-05-26 21:35:42 +05:30
Nabin Hait
38ada81487
bumped to version 8.0.40
2017-05-26 22:05:41 +06:00
Prateeksha Singh
e38c70c8bc
[fix] uppercase filter frappe/erpnext#8996 ( #9026 )
2017-05-26 21:34:18 +05:30
Francisco Roldán
44c1a610a1
Financial Statements Button translateabled ( #9032 )
2017-05-26 21:32:51 +05:30
Makarand Bauskar
157c334737
[minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents ( #9037 )
2017-05-26 21:32:33 +05:30
Nabin Hait
4b12896941
Party Dashboard: Consider any random company if default company not set ( #9046 )
2017-05-26 21:25:36 +05:30
Sagar Vora
7b0c682635
[fix] add round off difference to last row in landed cost voucher ( #8989 )
...
* [fix] add round off difference to last row in landed cost voucher
* Add test case for odd numbers
* Add assertEquals to verify applicable charges
* Use make_purchase_receipt, move round off logic
* Allow rounding difference
* Specify cost center to pass test
2017-05-26 14:58:54 +05:30
Ashwini Save
d702cbfbfa
Update code to fix issue #erpnext WN-SUP25349 : ValueError: max() arg is an empty sequence. ( #9025 )
2017-05-25 15:48:08 +05:30
Nabin Hait
45d337a016
Merge branch 'master' into develop
2017-05-25 14:19:51 +05:30
Nabin Hait
d7d9cd2938
bumped to version 8.0.39
2017-05-25 14:49:50 +06:00
Nabin Hait
7e7dc0f254
Update party.py
2017-05-25 14:18:20 +05:30
Ayush Shukla
e9cf1aba77
added float and rebase with hotfix ( #9019 )
2017-05-25 14:14:55 +05:30
Manas Solanki
c2bf50042f
validate email id only if provided ( #9020 )
2017-05-25 14:14:42 +05:30
bcornwellmott
8fa1e03367
Merge branch 'develop' into bom_convert_uom
2017-05-24 12:35:12 -07:00
Ben Cornwell-Mott
0f0b121669
Added BOM UOM selection for items
...
Added patch for BOM Item UOM
Fixed scrap qty issue
Added Scrap Qty update to patch
Reverted test record for production order
2017-05-24 11:12:51 -07:00
Nabin Hait
c795386230
Fixed merge conflict
2017-05-24 18:39:16 +05:30
Nabin Hait
12ec71781d
bumped to version 8.0.38
2017-05-24 19:08:33 +06:00
Makarand Bauskar
2f17e70793
[minor] removed the {next} for last page ( #9002 )
2017-05-24 18:35:35 +05:30
Manas Solanki
659a225f24
allow multiple items in purchase receipt ( #8997 )
2017-05-24 17:49:52 +05:30
Ishan Loya
9bf4563b7a
Change modified time
2017-05-24 17:47:42 +05:30
Ishan Loya
a70b41fbb8
Remove Role 'All' from BOM
2017-05-24 17:47:42 +05:30
CH
d0ebd7f7c2
POS translatable fields correction
2017-05-24 17:45:46 +05:30
Nabin Hait
adfe84b04f
Revert "Website Specification Labls should not be capitalised by default ( #8798 )"
...
This reverts commit 331566d612
.
2017-05-24 17:33:07 +05:30
Nabin Hait
7916590528
Revert "Update lead.py ( #8789 )"
...
This reverts commit 9283377f87
.
2017-05-24 17:33:07 +05:30
Nabin Hait
fdce7a0dc3
Revert "link the different doctype in the school module ( #8844 )"
...
This reverts commit c320537e4c
.
2017-05-24 17:33:07 +05:30
Nabin Hait
b3d4326dcc
Revert "Prompt for mandatory batch number in POS ( #8928 )"
...
This reverts commit ce9ac7885e
.
2017-05-24 17:33:07 +05:30
Nabin Hait
54fcf85317
Revert "Documentation for Allow Login using Mobile Number ( #8918 )"
...
This reverts commit 818ad397c8
.
2017-05-24 17:33:07 +05:30
Nabin Hait
689da20e7b
Revert "View Attachments in portal ( #8830 )"
...
This reverts commit 7e661437b1
.
2017-05-24 17:33:07 +05:30
Nabin Hait
eb92d907bc
Revert "Added flt to convert string to float"
...
This reverts commit bf4915b285
.
2017-05-24 17:33:07 +05:30
Nabin Hait
0cd792ebb2
Revert "Update taxes_and_totals.py"
...
This reverts commit e4afab7fb0
.
2017-05-24 17:33:07 +05:30
Rushabh Mehta
e4afab7fb0
Update taxes_and_totals.py
2017-05-24 17:29:23 +05:30
Ayush AS
bf4915b285
Added flt to convert string to float
2017-05-24 17:29:23 +05:30
Charles-Henri Decultot
7e661437b1
View Attachments in portal ( #8830 )
...
* View Attachments in portal
* HTML beautify correction
* Move option to shopping cart settings
* new field in shopping cart settings for public attachments display in portal
2017-05-24 17:29:23 +05:30
Gaurav Naik
818ad397c8
Documentation for Allow Login using Mobile Number ( #8918 )
2017-05-24 17:29:23 +05:30
Charles-Henri Decultot
ce9ac7885e
Prompt for mandatory batch number in POS ( #8928 )
...
* Prompt for mandatory batch number in POS
* Whitespaces correction
2017-05-24 17:29:23 +05:30
Manas Solanki
c320537e4c
link the different doctype in the school module ( #8844 )
2017-05-24 17:29:23 +05:30
Abdulla P I
9283377f87
Update lead.py ( #8789 )
...
* Update lead.py
Import datetime to compare next contact date with now()
* Update lead.py
* Update lead.py
As per the suggestion from Nabin,instead of Datetime,getdate and nowdate from frappe.utils imported
2017-05-24 17:29:23 +05:30
KanchanChauhan
331566d612
Website Specification Labls should not be capitalised by default ( #8798 )
2017-05-24 17:29:23 +05:30
nick9822
ca150cee8c
Minor change: Alert to msgprint ( #8966 )
...
* Minor change: Alert to msgprint
* msgprint to frappe.msgprint
2017-05-24 17:22:26 +05:30
mbauskar
ff70f38eac
[minor] patch to delete the schools deprecated doctypes
2017-05-24 17:13:16 +05:30
mbauskar
d1552f97e4
[minor] moved a comment in item.js
2017-05-24 17:13:16 +05:30
mbauskar
baa4afd67b
[minor] removed the Grade Interval and Grading Structure doctype
2017-05-24 17:13:16 +05:30
Nabin Hait
2f0c34385b
Check if doctype exists before renaming
2017-05-24 17:12:07 +05:30
Nabin Hait
258f7da778
Paid amount + Write Off Amount can not be greater than Grand Total in return POS
2017-05-24 17:12:07 +05:30
Nabin Hait
799a9cabe7
Can't change valuation method in stock settings, if there are transactions against some items which does not have it's own valuation method
2017-05-24 17:11:48 +05:30
Nabin Hait
24f0b13b22
Total unpaid amount in party is based on GLE
2017-05-24 16:46:56 +05:30
Nabin Hait
2d79a641c2
Annual billing amount in party dashboard based on grand total
2017-05-24 16:46:56 +05:30
Charles-Henri Decultot
032374e76e
Correction of the digest template ( #8992 )
2017-05-24 16:29:42 +05:30
Nabin Hait
7a9bd41a72
Improved currency exchange rate message
2017-05-24 16:18:36 +05:30
Nabin Hait
8fac45a885
Merge branch 'master' into develop
2017-05-24 09:07:26 +05:30
Nabin Hait
88906cfc63
bumped to version 8.0.37
2017-05-24 09:37:26 +06:00
Nabin Hait
e72c98dafb
On change of item rate, set margin amount on price list rate, instead of margin percentage ( #8988 )
2017-05-24 09:01:44 +05:30
Makarand Bauskar
3b9c2a4438
Added a reference of Sales Invoice in Serial No ( #8855 )
...
* [enhance] added Sales Invoice reference in Serial Number
* [patch] added test cases for Sales Invoice and added patch to copy sales invoice
* [minor] minor fixes in validate_serial_against_delivery_note
* [minor] fixes in sales invoice serial number validation
2017-05-23 18:45:34 +05:30
Nabin Hait
dce8dfc4fe
Merge branch 'master' into develop
2017-05-23 17:48:43 +05:30
Nabin Hait
c8a25b6dac
bumped to version 8.0.36
2017-05-23 18:18:42 +06:00
Makarand Bauskar
724cc35421
[minor] added columns to pos print_template ( #8978 )
2017-05-23 17:43:42 +05:30
Nabin Hait
c9f5d84742
Merge branch 'master' into develop
2017-05-23 17:16:19 +05:30
Nabin Hait
8854f8bd50
bumped to version 8.0.35
2017-05-23 17:46:19 +06:00
Manas Solanki
fe05645051
fix issue when image not saved after attaching ( #8957 )
2017-05-23 17:13:26 +05:30
Faris Ansari
29d64cae34
POS print format fix ( #8973 )
2017-05-23 17:12:51 +05:30
Paulo Almeida
97ff6fea47
add milestone field
2017-05-23 11:55:37 +01:00
Nabin Hait
889e456dab
Merge branch 'master' into develop
2017-05-23 12:04:06 +05:30
Nabin Hait
2ef20a968c
bumped to version 8.0.34
2017-05-23 12:34:05 +06:00
Nabin Hait
fdc7d7f3de
Check for active quotations before declaring it as lost ( #8969 )
2017-05-23 12:02:34 +05:30
Manas Solanki
a68fff470c
minor fix in student group ( #8959 )
2017-05-23 11:39:53 +05:30
Manas Solanki
552f7ab678
fix in the patch for merging the student batch and student group ( #8961 )
2017-05-23 11:38:57 +05:30
Faris Ansari
2424aa73d7
Fix translated string in jinja ( #8956 )
2017-05-22 13:09:36 +05:30
Rushabh Mehta
2b06633919
Merge branch 'master' into develop
2017-05-19 19:24:43 +05:30
Rushabh Mehta
f3a318921f
bumped to version 8.0.33
2017-05-19 19:54:42 +06:00
rohitwaghchaure
529f5ce503
[fix] Not able to change the status as Lost in opportunity ( #8938 )
2017-05-19 18:56:54 +05:30
rohitwaghchaure
177a26849d
[fix] Trial balance not working ( #8937 )
2017-05-19 18:56:25 +05:30
Rushabh Mehta
612b31b626
Merge branch 'master' into develop
2017-05-19 18:33:55 +05:30
Rushabh Mehta
d2484ece24
bumped to version 8.0.32
2017-05-19 19:03:54 +06:00
Rushabh Mehta
04ea4910f0
[rename] zh-tw -> zh-TW
2017-05-19 18:27:53 +05:30
Rushabh Mehta
03fb6ff003
[rename] zh-tw -> zh-TW
2017-05-19 18:26:49 +05:30
Charles-Henri Decultot
2de1cd3529
View Attachments in portal ( #8830 )
...
* View Attachments in portal
* HTML beautify correction
* Move option to shopping cart settings
* new field in shopping cart settings for public attachments display in portal
2017-05-19 16:04:10 +05:30
Gaurav Naik
7f02714c26
Documentation for Allow Login using Mobile Number ( #8918 )
2017-05-19 16:03:05 +05:30
Charles-Henri Decultot
8bec0239b9
Prompt for mandatory batch number in POS ( #8928 )
...
* Prompt for mandatory batch number in POS
* Whitespaces correction
2017-05-19 16:02:30 +05:30
Manas Solanki
56549fd3d9
link the different doctype in the school module ( #8844 )
2017-05-19 15:16:50 +05:30
Abdulla P I
6cbc9b03f9
Update lead.py ( #8789 )
...
* Update lead.py
Import datetime to compare next contact date with now()
* Update lead.py
* Update lead.py
As per the suggestion from Nabin,instead of Datetime,getdate and nowdate from frappe.utils imported
2017-05-19 15:15:36 +05:30
KanchanChauhan
32cbbe5cc2
Website Specification Labls should not be capitalised by default ( #8798 )
2017-05-19 15:14:31 +05:30
Rushabh Mehta
65a27395fe
[minor] remove student batch name from activation.py
2017-05-19 14:53:32 +05:30
Nabin Hait
4d2d996782
bumped to version 8.0.31
2017-05-19 14:42:28 +06:00
Nabin Hait
47afc55939
Merge branch 'master' of github.com:frappe/erpnext into hotfix
2017-05-19 14:10:53 +05:30
Nabin Hait
0096240a65
bumped to version 8.0.30
2017-05-19 14:38:59 +06:00
Makarand Bauskar
864f134610
[minor] removed the da-DK.csv translations ( #8930 )
2017-05-19 14:04:52 +05:30
Rohit Waghchaure
8a1c58c3c3
[fix] _ is not defined while accessing the POS
2017-05-19 13:01:32 +05:30
Ayush Shukla
ae696d005a
Changed report_hide=0 for reference_name ( #8902 )
2017-05-19 12:38:08 +05:30
Prateeksha Singh
89cec18467
set variant name based on template name (frappe/erpnext#6367) ( #8920 )
2017-05-19 12:35:36 +05:30
Rushabh Mehta
4bcc2316a9
Don't update variant when template is updated ( #8922 )
...
* [fix] allow editing of variant properties, reverting earlier fix
* [minor] dont automatically update variants when the template is saved
2017-05-19 12:33:00 +05:30
Nabin Hait
012c9a0916
Set default account in mode-of-payment Cash, only if default cash account exists ( #8909 )
2017-05-19 12:30:58 +05:30
Frappe PR Bot
c080479f1f
[translation] translation updates ( #8927 )
2017-05-19 12:30:04 +05:30
tundebabzy
a109141624
Issue 8842 ( #8869 )
...
* adds test that confirms #8842
* fixes #8842 and adds tests
* fixes new test case
* adds test for `encode_company_abbr`
* adds six as a requirement
* fixes six.moves.range import
* fixes duplicate company used in test
* fresh commit of test
* fixes failing test - company not saving
* fixes failing test
* Revert "adds six as a requirement"
This reverts commit 80454d98dc5859c37dbf589a4152663d2d644906.
* replaces whitespace indentation with tabs
2017-05-19 11:42:45 +05:30
Prateeksha Singh
064530d11f
[minor] remove order_type as setter in multiselect ( #8906 )
2017-05-19 11:09:12 +05:30
Rushabh Mehta
6799e27390
[fix] chart of accounts root sorting, #8784 , #8897 ( #8904 )
2017-05-18 16:21:21 +05:30
Rushabh Mehta
c6d75eb942
[fix] allow editing of variant properties, reverting earlier fix ( #8905 )
2017-05-18 16:21:01 +05:30
Nabin Hait
83f8344e62
Merge branch 'master' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:37 +05:30
Nabin Hait
ee59ecd396
Merge branch 'hotfix' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:06 +05:30
gmplab
7607cc9dfa
try to fix #997 ,when cart is disabled, it will not show error and it will dedirect to 'contact' page ( #8636 )
2017-05-18 12:41:19 +05:30
Frappe PR Bot
32e453b8eb
[translation] translation updates ( #8867 )
2017-05-18 12:35:26 +05:30
Nabin Hait
9422f69fdf
bumped to version 8.0.29
2017-05-18 12:31:53 +06:00
Nabin Hait
61ac683847
Fixed chart of accounts for Indonesia ( #8900 )
2017-05-18 11:58:38 +05:30
Nabin Hait
8fac2ad183
Don't set batch nos automatically on saving, if already set and validate qty with batch ( #8887 )
2017-05-18 11:54:24 +05:30
Omar Jaber
52e1ba7714
update throw message in maintenance_schedule.py ( #8896 )
...
updating Throw message
2017-05-18 11:53:26 +05:30
Nabin Hait
08ea710c8f
Minor fix in creating chart of accounts based on existing ( #8890 )
2017-05-17 19:43:12 +05:30
Nabin Hait
4b544347a9
Hide 'Edit Posting Time' from printing ( #8888 )
2017-05-17 19:42:38 +05:30
Francisco Roldán
85bfc05efa
Fix missing translations ( #8871 )
...
* Fix missing translations
* Fix
2017-05-17 19:42:04 +05:30
Nabin Hait
e4f80a6eaa
Open lost opportunity again if quotation made against it ( #8854 )
2017-05-17 19:41:39 +05:30
Rushabh Mehta
f69ffeb0b4
[fix] if rate is greater than price_list_rate, set margin instead of discount. Fixes frappe/erpnext#6468 ( #8856 )
2017-05-17 19:40:40 +05:30
Faris Ansari
f7a9023fda
Show empty state when no students are found in student attendance tool ( #8862 )
...
- fixes #8839
2017-05-17 19:37:31 +05:30
Julian Robbins
3d6567411d
Spelling improvmement ( #8866 )
2017-05-17 19:36:15 +05:30
Felipe Orellana
0952df29dc
Update product.py ( #8877 )
...
Hi!
If template_item_code is None on line 71-72 the query will return ALL "Item Price" records irrespective of item_code, potentially causing the wrong price list rate to be used.
Noticed this behavior when fetching product price for a group of items without "variant_of" data.
2017-05-17 19:20:01 +05:30
Ayush Shukla
76d965f340
[minor]-Changed receivable to payable ( #8880 )
2017-05-17 19:18:47 +05:30
Ayush Shukla
c55b805b66
[minor] process_payroll_create salary fixed, fixes frappe/erpnext#8853 ( #8881 )
...
* [minor] process_payroll_create salary fixed
* [minor] indentation fix
2017-05-17 19:18:26 +05:30
tundebabzy
cf7df5d106
fixes #8883 ( #8885 )
2017-05-17 19:17:04 +05:30
Sagar Vora
3b04b030eb
Fix cost center not getting pulled in DN and SINV ( #8878 )
...
* Fixes for getting selling cost center instead of company's default cost center.
* fix error in update_item
2017-05-17 19:16:27 +05:30
Nabin Hait
def2e4678c
bumped to version 8.0.28
2017-05-17 14:24:04 +06:00
Nabin Hait
1e2d7b3519
Filters for multiselect dialog for DN/PR in Sales/Purchase Invoice ( #8882 )
2017-05-17 13:52:21 +05:30
Nabin Hait
a282c13d84
bumped to version 8.0.27
2017-05-16 14:09:41 +06:00
rohitwaghchaure
a689432a6e
[fix] Can't update naming series if format has year,month ( #8836 )
2017-05-16 12:47:34 +05:30
rohitwaghchaure
3da400b532
[fix] Due Date cannot be before Posting Date during amendement of an invoice ( #8841 )
2017-05-16 12:43:18 +05:30
Nabin Hait
8a27cf3785
Fix status of invoices with negative outstanding, if no return entry ( #8829 )
...
* Move allowance field in Item to the first section to apply it for both stock and non-stock items
* Fix status of invoices with negative outstanding, if no return entry
* get_value included in safe_eval
2017-05-16 12:43:00 +05:30
rohitwaghchaure
73456ac81a
[fix] Payments on the invoice is showing even if IS POS option is disabled ( #8802 )
2017-05-16 11:29:57 +05:30
Saurabh
aa1be1ce92
[documentaion] stripe documentation ( #8780 )
2017-05-16 09:30:07 +05:30
rohitwaghchaure
654f186f95
[fix] Apply pricing rule on the item based on quantity as per stock uom ( #8792 )
2017-05-16 08:54:29 +05:30
rohitwaghchaure
09483d3c0f
[fix] Numeric keypad not displaying after creation of new customer ( #8797 )
2017-05-16 08:51:24 +05:30
Makarand Bauskar
5886aafbae
[minor] removed cur_frm and added frappe.ui.form.on ( #8803 )
2017-05-16 08:35:39 +05:30
Charles-Henri Decultot
156eef1907
Description correction ( #8811 )
2017-05-16 08:34:33 +05:30
Faris Ansari
74e2e4672c
Fix for duplicated project dependencies ( #8817 )
...
- skip when task is not found
2017-05-16 08:32:45 +05:30
Saurabh
f4ee682400
[fix] pass company filter as string in get_value ( #8823 )
2017-05-16 08:30:27 +05:30
Makarand Bauskar
475d140b5c
[minor] made items table mandatory for quotation ( #8825 )
2017-05-16 08:26:21 +05:30
Ishan Loya
bdb2f95957
Show duplicate button in BOM unless in draft stage ( #8826 )
2017-05-16 08:25:07 +05:30
Makarand Bauskar
3e2c9d00f1
[minor] Corrected field label & placed Expense Claim button in Next Step ( #8828 )
2017-05-16 08:22:45 +05:30
rohitwaghchaure
d678809939
[fix] Party balance field showing wrong currency symbol ( #8832 )
2017-05-16 08:06:45 +05:30
Manas Solanki
59472e5449
Changes in the student group creation tool ( #8833 )
2017-05-16 08:05:14 +05:30
Manas Solanki
c5f79d2ec4
Fix for the student batch-wise attendance report ( #8834 )
2017-05-16 08:00:24 +05:30
Makarand Bauskar
b0df661e81
[minor] set set_posting_time to 1 while data import ( #8835 )
2017-05-16 07:59:58 +05:30
Rushabh Mehta
939db36ad4
[fix] copy item variant values on save and make non no_copy fields as not editable. fixes frappe/erpnext#4253 ( #8837 )
2017-05-16 07:42:44 +05:30
Faris Ansari
4fcd8a6db3
Fix sales funnel legend position ( Fixes #5073 ) ( #8838 )
2017-05-16 07:40:26 +05:30
Faris Ansari
769b6bada8
[POS] Add Pay menu item in mobile view ( #8801 ) ( #8845 )
2017-05-16 07:31:10 +05:30
Faris Ansari
125996e21c
Increase item cart height in mobile view ( Fixes #8827 ) ( #8846 )
2017-05-16 07:29:15 +05:30
Nabin Hait
7bf810300e
Fixed #8822 , active students patch
2017-05-15 11:42:37 +05:30
Prateeksha Singh
edeb4dc7e0
Multiselect dialog for getting items ( #8583 )
...
* Concatenate docnames and send to mapper
* Multiselect with checkboxes
* set setters as separate filters
* Map filter fields to target_doc
* Get items from quotation (in SO) working
* [major] Set dialog setters for all forms
* Add date field
* Specify non-default date_fields
* [minor] add test_mapper.py
* [minor] remove cur_frm
* [minor][fix] test
* [minor] fix test with make_test_records
2017-05-15 11:32:06 +05:30
Julian Robbins
62e3e75555
Addition of Imap to description of usable mail accounts ( #8806 )
2017-05-13 09:55:23 +05:30
Saurabh
82e303882e
bumped to version 8.0.26
2017-05-13 08:12:03 +06:00
Saurabh
45540569ff
[fix] rename Student Batch to Student Batch Name in activation check
2017-05-13 06:30:41 +05:30
Makarand Bauskar
d4e15ca359
[minor] create student batch if does not exists ( #8781 )
...
* [minor] create student batch if does not exists
* [fix] minor fixes in if condition
2017-05-12 11:23:58 +05:30
Makarand Bauskar
e8270fe21c
[fix] minor fix in get_context for item variants ( #8791 )
2017-05-12 11:23:23 +05:30
Saurabh
62c7deee00
[fix] don't allow string values in limits to avoid sql injection ( #8779 )
2017-05-11 18:03:12 +05:30
Nabin Hait
b579fd7ada
bumped to version 8.0.25
2017-05-11 17:36:56 +06:00
Nabin Hait
4f5ad50ecf
Item Rate in Sales Return must be less than or equal to reference doc ( #8775 )
...
* Item Rate in Sales Return must be less than or equal to reference doc
* Fix as rate field is not there in Packed Item
2017-05-11 16:44:19 +05:30
Nabin Hait
5ad6126832
On saving of Accounts Settings, only save enabled warehouses ( #8772 )
2017-05-11 13:34:04 +05:30
Nabin Hait
62d27ab7d3
Reload doctype bewfore renaming margin fields ( #8771 )
2017-05-11 13:26:55 +05:30
KanchanChauhan
f74010d379
Calculations based on working and payment days should be made if salary structure exists ( #8770 )
2017-05-11 11:42:35 +05:30
Makarand Bauskar
0e4c5c9efb
[minor] renamed a Total Margin field to Rate With Margin ( #8720 )
...
* [minor] renamed a Total Margin field to Rate With Margin
* [minor] minor fixes in field lable
2017-05-11 11:40:02 +05:30
Faris Ansari
734d7795f8
Show party name in General Ledger print report ( #8760 )
2017-05-11 11:38:30 +05:30
Makarand Bauskar
464f108586
[minor] added currency in Totals for Trial Balance report ( #8757 )
...
* [minor] added currency in Totals for Trial Balance report
* [minor] used erpnext.get_default_currency to fetch the company currency
2017-05-10 19:40:36 +05:30
KanchanChauhan
323e46ba5a
Added parent filter to the Salary Structure Employee since it was getting base and variable value from first found Salary Structure Employee ( #8756 )
2017-05-10 17:46:32 +05:30
Makarand Bauskar
62414565b1
[minor] added the address_html field in company doctype ( #8754 )
2017-05-10 14:52:03 +05:30
Manas Solanki
426b8a14fd
Merge the student group and student batch ( #8663 )
...
* deleted student batch creation tool
* Patch for deleting the doctype and config
* Changes in the student attendance
* Patch for renaming the student batch as student group
* Changes in the student attendance
* Change in the student attendance reports
- Absent student report
- Student Batch-wise attendance
- Student monthly attendance sheet
* Changes in the patch
* Changes in the course schedule
* Changes in the course scheduling tool
* Change in the assessment plan
* Changes in the assessment result tool
* Cleanup
* Changes in the api.py
* create student group from student batch
* delete student batch
* add patch
* remove student batch from config/schools.py
* Delete the depricated doctype with patch
* Changes in patch
* Changes as per PR
2017-05-09 15:32:52 +05:30
Nabin Hait
70e1778712
bumped to version 8.0.24
2017-05-09 15:43:32 +06:00
Nabin Hait
4e6ff8ccd8
Ignore permission for Bin in warehouse query ( #8742 )
2017-05-09 15:09:10 +05:30
Rushabh Mehta
95233a62d7
[minor] item route item_name + random string
2017-05-09 07:48:41 +05:30
Nabin Hait
226ea7db88
Filter issue on timesheet calendar view ( #8730 )
2017-05-08 17:34:07 +05:30
Saurabh
9df45bbc42
[fix] Reference Document is required to create Payment Request ( #8729 )
...
* [fix] Referene Document is required to create Payment Request
* Update payment_request.py
2017-05-08 17:24:23 +05:30
Rushabh Mehta
a6bc583daf
[minor] item route is item name + code
2017-05-08 11:35:40 +05:30
Nabin Hait
b5a9822fff
bumped to version 8.0.23
2017-05-06 14:10:52 +06:00
Nabin Hait
17179ee83a
minor syntax fix
2017-05-06 13:23:12 +05:30
Ishan Loya
120ee275cc
Fix typo ( #8719 )
2017-05-06 12:48:22 +05:30
Makarand Bauskar
486045e1d1
[minor] check if date of joining is available before creating Salary Slip ( #8700 )
2017-05-06 12:47:42 +05:30
Nabin Hait
3257aeeb55
Price list rate fix multiple uom and validation with prev doc ( #8718 )
2017-05-06 12:47:14 +05:30
Nabin Hait
7228e1af6e
Customer/Supplier Name in sales/purchase analytics ( #8717 )
2017-05-06 12:45:37 +05:30
Nabin Hait
6e7407962f
Get exchange rate only if date and currency is present ( #8712 )
...
* Get exchange rate only if date and currency is present
* Update transaction.js
2017-05-06 12:45:16 +05:30
Rushabh Mehta
b7e740ff45
[minor] ignore permissions for bin on warehouse_query ( #8713 )
2017-05-06 12:44:03 +05:30
Dominik Ottenbreit
51cd2df763
Fix Romanian Translation ( #8706 )
2017-05-05 17:30:45 +05:30
Pawan Mehta
cac94b9bd5
[fix] #8373 ( #8707 )
2017-05-05 17:29:57 +05:30
Manas Solanki
65c8466622
check for mandatory field before frappe.call ( #8705 )
2017-05-05 17:28:09 +05:30
Nabin Hait
42343bbc2c
Selling price validation against last purchase rate / valuation rate ( #8702 )
2017-05-05 17:23:17 +05:30
KanchanChauhan
ed56b8afd8
Website route for item based on name not item name ( #8682 )
2017-05-05 11:56:55 +05:30
Makarand Bauskar
6b3bc8a8e1
[hotfix] fixed the recursion error while saving the User ( #8696 )
2017-05-05 11:53:00 +05:30
Makarand Bauskar
c4ec937835
[hotfix] fixed object has no attribute 'delivered_by_supplier' ( #8699 )
2017-05-05 11:52:17 +05:30
Nabin Hait
d2a966eef3
Update general_ledger.py
2017-05-05 10:41:16 +05:30
rohitwaghchaure
6324987c15
[fix] Company's abbreviation change will not update the warehouse ( #8685 )
2017-05-04 16:12:29 +05:30
Nabin Hait
8470b39d4c
bumped to version 8.0.22
2017-05-04 12:50:31 +06:00
Nabin Hait
932423ecba
Balance Sheet always shows accumulated values from previous fiscal year ( #8668 )
2017-05-04 12:12:29 +05:30
Faris Ansari
1c09a991f3
Change beta_version to 8.x-beta ( #8673 )
...
* Change beta_version to 8.x-beta
* change to 8.x.x-beta
2017-05-04 12:12:14 +05:30
Nabin Hait
fcc0246b38
Get mobile nos for customer contact ( #8674 )
2017-05-04 12:11:48 +05:30
Nabin Hait
3ce41d6b1f
Fixed related to auto fetching batch nos and date valiation in salary structure ( #8666 )
...
* Fixed related to auto fetching batch nos and date valiation in salary structure
* Update get_item_details.py
2017-05-03 18:22:24 +05:30
Javier Wong
470535ae9b
Removed set_default_roles
...
set_default_roles was removed in 7fff0908a4
It is not required anymore. It currently breaks the patch.
2017-05-03 16:44:14 +05:30
rohitwaghchaure
a1923574c6
Merge pull request #8657 from rohitwaghchaure/pos_email_id_issue
...
[fix] Contact not creating if only email id has entered in the POS
2017-05-03 12:56:13 +05:30
Nabin Hait
ef027e9030
Correct args to the fmt_money function
2017-05-03 11:51:47 +05:30
Aditya Duggal
bd8c7d683b
Website related fields now consider show_variant_in_website field as well
...
-Resolves issue #8635
2017-05-03 10:14:09 +05:30
Rohit Waghchaure
fd37516165
[fix] Contact not creating if only email id has entered in the POS
2017-05-02 18:27:09 +05:30
Nabin Hait
504eba7fb2
Test case fixed for Employee Loan Application
2017-05-02 18:19:48 +05:30
Nabin Hait
e15721df48
Caluculate total interest and payable amount in Loan Application if fixed amount per period
2017-05-02 18:19:48 +05:30
mbauskar
c482aeda1a
[fixes] added missing get_linked_material_requests method to buying utils
2017-05-02 14:05:54 +05:30
Rohit Waghchaure
61165127fc
[fix] Default pos profile's customer not working for the POS
2017-05-02 13:04:08 +05:30
Nabin Hait
fb73621db2
bumped to version 8.0.21
2017-05-02 10:28:48 +06:00
Rohit Waghchaure
3df7eef6cc
[fix] Unable to create an asset due to rounding issue
2017-05-02 09:49:02 +05:30
akshay
b674d27285
Test Cleanup
2017-05-02 09:48:51 +05:30
akshay
949fbc559e
Serial No Rename
2017-05-02 09:48:51 +05:30
Nabin Hait
1117125841
Update domainify.py
2017-05-01 11:40:13 +05:30
mbauskar
e94c6e7b8e
[minor] disabled the instructor role if the company domain is not Education
2017-05-01 11:40:13 +05:30
Nabin Hait
589927b37d
bumped to version 8.0.20
2017-04-28 16:04:58 +06:00
Nabin Hait
2afb9b96cd
pricing rule fix
2017-04-28 15:20:49 +05:30
Nabin Hait
8c9fb76854
Remove pricing rules if 'Ignore Pricing Rule' manually triggered
2017-04-28 15:20:49 +05:30
Manas Solanki
0da9bc6309
Fix for program enrollment
2017-04-28 14:37:25 +05:30
Manas Solanki
5a8a5b7d06
Fixes in Student Group
2017-04-28 14:37:25 +05:30
Manas Solanki
71373a176d
Configurable validation setting for the student group
2017-04-28 14:37:25 +05:30
mbauskar
1b6270ef40
[hotfix] error while sending the auto email report of Ordered Items To Be Delivered
2017-04-28 14:35:18 +05:30
Rohit Waghchaure
ac28ffb41e
[fix] frappe.db.exists('Series', series) is not working because tabSeries table did not have column modified
2017-04-28 14:34:11 +05:30
Rohit Waghchaure
0e6ac8b9b4
Enabled option User Cannot Search for the gl entry doctype
2017-04-28 10:03:18 +05:30
Rohit Waghchaure
07ef5f42c4
[enhance] Show notification for draft state records if doctype is submittable
2017-04-28 09:59:29 +05:30
Nabin Hait
7b04f092a6
Fixed test cases
2017-04-28 09:58:41 +05:30
Nabin Hait
c98f37f91c
Patch for reverting manufacturers table from item
2017-04-28 09:58:41 +05:30
Nabin Hait
b6a8920489
Fixed conflict
2017-04-28 09:58:41 +05:30
Nabin Hait
ecd46588ec
bumped to version 8.0.19
2017-04-26 15:15:37 +06:00
Nabin Hait
96c247c834
Pick batch autmatically only if batch found
2017-04-26 14:37:33 +05:30
Nabin Hait
db8f41ba55
Added Payment documents as Quick Links in SO/PO
2017-04-26 14:34:41 +05:30
Nabin Hait
5b73a4864a
bumped to version 8.0.18
2017-04-25 21:14:54 +06:00
Nabin Hait
85622f9ccb
Update update_status_as_paid_for_completed_expense_claim.py
2017-04-25 20:43:29 +05:30
pawan
c27d9f712b
Add Report Links
2017-04-25 20:12:55 +05:30
Umair Sayyed
175646572a
updated help pages
2017-04-25 16:27:50 +05:30
Nabin Hait
d5d8db7a3f
Cleanup on financial statement PR
2017-04-25 16:26:33 +05:30
Nabin Hait
39bcb3de4b
Merge branch 'accumulated_header_std' of https://github.com/RicardoJohann/erpnext into RicardoJohann-accumulated_header_std
2017-04-25 16:13:54 +05:30
Ishan Loya
09fe8e0522
Add bank guarantee to Accounts module display screen
2017-04-25 16:08:22 +05:30
Ishan Loya
17737e4ab1
Change permissions, change account fieldname and add notes section
2017-04-25 16:08:22 +05:30
Ishan Loya
2fca72ae8e
Change owner
2017-04-25 16:08:22 +05:30
Ishan Loya
0dbe8547e7
Add screenshot to documentation, change naming series to BG-#####, make Bank Guarantee number unique
2017-04-25 16:08:22 +05:30
Ishan Loya
e1ed5ba726
Remove commented out code
2017-04-25 16:08:22 +05:30
Ishan Loya
0fc57a7df2
Change doctype owner
2017-04-25 16:08:22 +05:30
Ishan Loya
c7a72684fd
Add bank guarantee doctype with documentation
2017-04-25 16:08:22 +05:30
Nabin Hait
020dedd00e
Cleaned up and commonified the campaign efficiency and lead owner efficiency report
2017-04-25 16:05:01 +05:30
Nabin Hait
28dad095fa
Merge branch 'fixes_8466' of https://github.com/PawanMeh/erpnext into PawanMeh-fixes_8466
2017-04-25 15:00:45 +05:30
Nabin Hait
8590d5b05d
bumped to version 8.0.17
2017-04-25 15:00:50 +06:00
sburanaw
66951e528f
Fix an import typo in get_item_details.py
2017-04-25 14:09:51 +05:30
Nabin Hait
9b20e07431
[fix] currency field precision
2017-04-25 14:09:29 +05:30
Manas Solanki
d7afa69c6f
fix
2017-04-25 14:08:43 +05:30
Manas Solanki
c61dc9c7ea
Change in the assessment tool
2017-04-25 14:08:43 +05:30
mbauskar
9cf6d630e9
[minor] fixes for expense claim status
2017-04-25 13:15:50 +05:30
Faris Ansari
5687e2da9d
[ui-fix] POS item list
2017-04-24 19:22:05 +05:30
Nabin Hait
e3c122d8c4
AR report: filter based on customer group and credit days based on field. Fixed #8214
2017-04-24 19:06:07 +05:30
Nabin Hait
4cc5e61f60
Update course_schedule.py
2017-04-24 19:00:49 +05:30
Manas Solanki
6293263095
test case fixed
2017-04-24 19:00:49 +05:30
Manas Solanki
810e483757
Changes in the student group
2017-04-24 19:00:49 +05:30
Nabin Hait
e2741e85fd
bumped to version 8.0.16
2017-04-24 19:29:01 +06:00
Rohit Waghchaure
dd70fbfdae
[fix] Letter head not showing in the report
2017-04-24 18:57:51 +05:30
Manas Solanki
6eaf281b2b
Export and import program enrollments
2017-04-24 18:44:12 +05:30
pawan
134487ab2a
Changes after review
2017-04-24 13:48:40 +05:30
pawan
7bd7df3742
Changes after review
2017-04-24 13:19:22 +05:30
Ishan Loya
56c1b2a625
Make proposed corrections
2017-04-24 10:44:36 +05:30
Ishan Loya
b12e15dcc4
Change modified by
2017-04-24 10:44:36 +05:30
Ishan Loya
e5fdd47fd8
Hide 'Qty Transferred for Manufacturing' field if skip material transfer
2017-04-24 10:44:36 +05:30
Ishan Loya
04c69fb46d
Minor fix
2017-04-24 10:44:36 +05:30
Ishan Loya
f04ef8dfe0
Update documentation for Production Order skipping material transfer entry option
2017-04-24 10:44:36 +05:30
Ishan Loya
7544904857
Add option to skip material transfer for production orders
2017-04-24 10:44:36 +05:30
Rushabh Mehta
c44910370b
[fix] is_sample_item
2017-04-24 10:28:38 +05:30
Rushabh Mehta
551406ab11
[enhance] automatic batch selection in Delivery Note and Stock Entry
2017-04-24 10:28:38 +05:30
Rushabh Mehta
e385b5b97b
[enhance] automatic batch creation, move and split
2017-04-24 10:28:38 +05:30
mbauskar
bb2670d57a
[fixes] minor fixes in bank reconciliation form and report
2017-04-24 10:23:50 +05:30
mbauskar
0b293133be
[minor] fixes for unsupported operand type(s) for +=: 'int' and 'NoneType'
2017-04-21 21:40:30 +05:30
ibi
83c1c3a171
fleet_management: replace references to fleet_management by hr in vehicle_log doctype
2017-04-21 17:57:07 +05:30
mbauskar
c3d642e5d1
[minor] allow bulk edit for doctype
2017-04-21 17:50:40 +05:30
Manas Solanki
8230ce095f
[Fix] fixed routing to the assessment result
2017-04-21 17:49:52 +05:30
Nabin Hait
557847a5ba
bumped to version 8.0.15
2017-04-21 12:19:09 +06:00
mbauskar
9bac58cdc6
[fixes] fixes in setup wizard for education domain
2017-04-21 11:38:28 +05:30
Nabin Hait
9afb53203f
bumped to version 8.0.14
2017-04-20 09:21:44 +06:00
Nabin Hait
825e053e66
Fixed project_copied_from patch
2017-04-20 08:50:37 +05:30
Nabin Hait
e42fb32f6f
Fixed allow_zero_valuation_rate patch
2017-04-20 08:45:18 +05:30
Nabin Hait
68ae9f3f88
Merge branch 'develop' into allow_on_submit_fix
2017-04-19 21:10:23 +05:30
mbauskar
8f3cc81302
[minor] minor fixes in pricing_rule and set_missing_value
2017-04-19 21:05:37 +05:30
mbauskar
9e9d242a24
[minor] fixes in test cases and added the test case for multiple uom in selling
2017-04-19 21:05:37 +05:30
mbauskar
287fe81329
[minor] calculate price list rate based on items uom
2017-04-19 21:05:37 +05:30
Nabin Hait
f382373cf4
Merge branch 'develop' into develop
2017-04-19 21:01:19 +05:30
CH
61f4a8e757
Make the address type translatable in the Address_HTML field
2017-04-19 20:58:53 +05:30
Nabin Hait
eef55185fc
Update purchase_receipt_item.json
2017-04-19 20:58:09 +05:30
Nabin Hait
8691e0777b
Update purchase_invoice_item.json
2017-04-19 20:58:09 +05:30
Nabin Hait
2de3bf7a0f
Fixed indexes on sales and purchase transactions
2017-04-19 20:58:09 +05:30
Julian Robbins
2e6f12b850
Update purchase-details.md
2017-04-19 20:55:04 +05:30
mbauskar
ba41242f1f
[fixes] fixed the pricing rule issue https://github.com/frappe/erpnext/issues/8493
2017-04-19 20:54:23 +05:30
Kanchan Chauhan
0633df5872
Item variant searchable in website products
2017-04-19 20:51:43 +05:30
Rohit Waghchaure
f4f774d1df
[fix] offline_pos_name is not defined during print from the POS
2017-04-19 20:50:35 +05:30
Faris Ansari
695327a513
Duplicate dependencies when project is duplicated
...
- fix frappe/erpnext#8274
2017-04-19 20:48:49 +05:30
Rohit Waghchaure
019501e4a0
[fix] Balance Sheet, linking account to general ledger is not working
2017-04-19 20:46:30 +05:30
Nabin Hait
2704162f5a
Fixes allowd on submit
2017-04-19 16:25:39 +05:30
Nabin Hait
117be7ddd5
Added a settings in Accounts Settings to disable booking depreciation entry automatically
2017-04-18 14:03:06 +05:30
Nabin Hait
8a01980757
Unlink Journal Entry reference from Asset
2017-04-18 13:11:10 +05:30
mbauskar
5123a8519b
[minor] check if joining date is available before validating attandance date
2017-04-18 11:08:57 +05:30
Rohit Waghchaure
d7de3c606b
[fix] Pricing rule for pos
2017-04-17 17:32:36 +05:30
Rohit Waghchaure
dc981dc546
[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue
2017-04-17 17:31:32 +05:30
Nabin Hait
4d1cf53466
bumped to version 8.0.13
2017-04-17 16:06:58 +06:00
Nabin Hait
e2431fd5e9
minor fix
2017-04-17 15:35:36 +05:30
Nabin Hait
ad65be8250
bumped to version 8.0.12
2017-04-17 15:42:17 +06:00
Manas Solanki
ae30026005
Calender view fix for course schedule
2017-04-17 14:55:54 +05:30
Manas Solanki
54c4240d9c
Changes in the program enrollment
2017-04-17 14:55:54 +05:30
Manas Solanki
79683d0871
Added school setting
2017-04-17 14:55:54 +05:30
Manas Solanki
a6d1876958
Changes in course and program
2017-04-17 14:55:54 +05:30
Manas Solanki
346928f2bc
changes in program enrollment and tool
2017-04-17 14:55:54 +05:30
Nabin Hait
310d238d17
Merge pull request #8460 from rohitwaghchaure/client_followup_report
...
Client followup report
2017-04-17 14:13:38 +05:30
Nabin Hait
5e25731188
Update crm_reports.md
2017-04-17 14:13:20 +05:30
Nabin Hait
83ca262e38
Merge pull request #8453 from StrellaGroup/develop
...
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-17 14:00:12 +05:30
mbauskar
8a2e6f427b
[minor] if address is not found then set the address_field to '' instead of None
2017-04-17 13:58:52 +05:30
Faris Ansari
8371c1c4cd
Text overflow fix for product text in portal
2017-04-17 13:57:19 +05:30
Julian Robbins
361e7f6ddc
Remove typos and use better English
2017-04-17 13:56:53 +05:30
mbauskar
22cedeb006
[minor] POS & RFQ format_number fixes
2017-04-17 12:24:24 +05:30
pawan
83c8ed0827
”[fix]
2017-04-17 01:02:56 +05:30
Rushabh Mehta
e3c117e32c
[fix] validate preferred email if set in employee.py
2017-04-15 16:59:39 +05:30
Nabin Hait
307543f968
bumped to version 8.0.11
2017-04-14 18:02:37 +06:00
Rohit Waghchaure
6681b0d2aa
Documentation
2017-04-14 17:14:03 +05:30
Javier Wong
54d9c9eaf4
Merge branch 'develop' into develop
2017-04-14 18:33:44 +08:00
Javier Wong
9b11d9b45d
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-14 18:24:04 +08:00
mbauskar
cca55ddc33
[minor][hot] fixes for KeyError: from_date for stock balance report
2017-04-14 14:54:11 +05:30
Rohit Waghchaure
1c68509426
[enhance] Report for prospects engaged but not converted
2017-04-14 12:28:59 +05:30
mbauskar
1e05077b1f
[minor] sales register report fixes
2017-04-14 09:59:49 +05:30
joezsweet
b81244342f
Create en-GB.csv
...
- added for compatibility with frappe languages
2017-04-13 19:09:06 +05:30
CH
8e92250798
Correction of issue #8354
2017-04-13 18:59:51 +05:30
CH
d20ec25c92
Removal of double brackets to setup the chart of accounts in the setup wizard
2017-04-13 18:59:06 +05:30
Nabin Hait
25bcb14c1d
Merge pull request #8440 from mbauskar/cart-fixes
...
[minor] fides for add to card button issue
2017-04-13 18:49:22 +05:30
Nabin Hait
f6149f1507
Merge pull request #8429 from ckosiegbu/payroll_updates
...
Statistical Components for Salary Structure
2017-04-13 18:48:47 +05:30
Nabin Hait
2f3585f949
Update salary_slip.js
2017-04-13 18:47:25 +05:30
mbauskar
ed8ad9cfee
[minor] fides for add to card button issue
2017-04-13 18:45:09 +05:30
Nabin Hait
3a2727c9eb
Merge pull request #8430 from mbauskar/stock-entry-supplier-address
...
[minor] fetch supplier address, address_display on supplier trigger
2017-04-13 18:45:09 +05:30
Nabin Hait
16d92e7270
Update update_supplier_address_in_stock_entry.py
2017-04-13 18:44:33 +05:30
Nabin Hait
8c7eb444ef
Merge pull request #8439 from mbauskar/subsciption-fixes
...
[minor] validate email address before get update button click
2017-04-13 18:41:49 +05:30
mbauskar
9a0efc7710
[minor] validate email address before get update button click
2017-04-13 18:18:18 +05:30
mbauskar
3ddfce4f17
[patch] move supplier_address to address_display and set supplier_address in SE
2017-04-13 16:46:41 +05:30
ckosiegbu
a236f4e586
Space to Tabs on salary_slip.py
2017-04-13 10:28:10 +01:00
Nabin Hait
0b62c6ebd4
Merge pull request #8432 from mbauskar/bom-tree-fixes
...
[minor] fixes in bom tree view template
2017-04-13 14:36:45 +05:30
mbauskar
40ca4c3bbb
[minor] fixes in bom tree view template
2017-04-13 14:29:19 +05:30
Nabin Hait
c454dc7af5
Merge pull request #8420 from netchampfaris/pos
...
[POS] Show stock quantity of items
2017-04-13 13:26:58 +05:30
Rushabh Mehta
994cef5ee3
[minor] fix imports in old patches
2017-04-13 13:14:05 +05:30
Faris Ansari
185762aeeb
update label
2017-04-13 12:36:08 +05:30
mbauskar
1b32d913a2
[minor] fetch supplier address, address_display on supplier trigger
2017-04-13 11:55:20 +05:30
ckosiegbu
64f29f819a
Introduce the ability to specify in a Salary Structure that a component is statistical. This allows components to be used in calculations without being added/deducted from earnings deductions.
2017-04-13 00:00:37 +01:00
Nabin Hait
2efe05c1ce
Merge pull request #8263 from frappe/revert-8126-issue8094
...
Revert "Add link field Package Code (fixes #8094 )"
2017-04-12 19:50:43 +05:30
Nabin Hait
a220e96867
bumped to version 8.0.10
2017-04-12 19:30:52 +06:00
mbauskar
e471b02172
[minor] if packed item warehouse not found then set the parent item warehouse to packed items
2017-04-12 18:51:01 +05:30
Faris Ansari
19f90e984e
[POS] Show stock quantity of items
...
- frappe/erpnext#8247
2017-04-12 16:06:31 +05:30
Faris Ansari
b5608f9b14
[fix] Default Print Format for Sales Invoice ( #8419 )
...
- frappe/erpnext#8416
2017-04-12 15:31:01 +05:30
rohitwaghchaure
5adce495aa
Merge pull request #8417 from rohitwaghchaure/due_date_issue
...
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 14:43:21 +05:30
Rushabh Mehta
66272a168d
[minor] README.md + encode query parameter in search
2017-04-12 14:32:07 +05:30
Rohit Waghchaure
2192c244c0
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 13:19:05 +05:30
Makarand Bauskar
141c244ece
[minor] added order by args to get_*_list methods ( #8413 )
2017-04-12 13:02:28 +05:30
Nabin Hait
d1fda1ff2b
bumped to version 8.0.9
2017-04-11 19:44:12 +06:00
mbauskar
b9d0e7622a
[translation] translation updates for - erpnext on 2017-04-04
2017-04-11 18:57:48 +05:30
mbauskar
2f9703c20e
[minor] set company_currency as account_currency in general ledger if party type is employee
2017-04-11 18:56:41 +05:30
Khairil Zhafri
46b6d4ea47
Update student.json
...
Less binary gender option for Student
2017-04-11 18:55:31 +05:30
Khairil Zhafri
417145bec5
Update employee.json
...
Less binary gender options for Employee
2017-04-11 18:55:20 +05:30
Rohit Waghchaure
1ff1368280
[fix] Vehicle expense report not working
2017-04-11 18:54:32 +05:30
joezsweet
768a888bf2
[fix] validate supplier invoice
...
- modified to check for the selected supplier only
2017-04-11 18:52:46 +05:30
Julian Robbins
8037a0e3d5
Update assignment.md
...
A typo and improvement tom English
2017-04-11 18:51:34 +05:30
mbauskar
0b665ac791
[minor] don't throw error for buying transactions if price list is not selected
2017-04-11 18:51:12 +05:30
Rohit Waghchaure
87ad6d074a
[enhance] Stock qty added in purchase invoice
2017-04-11 18:29:52 +05:30
Kanchan Chauhan
95108ac80b
[Minor] Party validation for Employee
2017-04-11 18:29:27 +05:30
Dominik Ottenbreit
9b9777be3f
Fix mistranslation "Lieferantennauftrag" -> "Bestellung"
...
There is the strange term of "Lieferantenauftrag" that has been used for
"Purchase Order" which translates to "Supplier Order". This is not
standard at all and should be fixed to "Bestellung".
A Google search for "Bestellung" returns 97 million results, a search
for "Lieferantenauftrag" returns 972 results so it should be clear what
is standard.
2017-04-11 18:28:35 +05:30
Nabin Hait
075b299673
bom traversing: argument mutable issue
2017-04-11 18:27:34 +05:30
mbauskar
e0271a8331
[minor] ReferenceError:doc fixes for delivery note
2017-04-11 17:54:22 +05:30
mbauskar
236f7aac7f
[minor] track changes for transaction documents
2017-04-10 14:48:54 +05:30
Manas Solanki
29ee263093
Fix in student attendacne tool
2017-04-10 14:33:35 +05:30
Makarand Bauskar
4782e8b751
[minor] added safe_eval for status_updater and added getdate and nowdate ( #8365 )
2017-04-07 17:16:16 +05:30
Rushabh Mehta
b58979fd3e
[added] frappe.safe_eval
2017-04-06 18:58:39 +05:30
Rushabh Mehta
9365641777
[added] frappe.safe_eval
2017-04-06 18:24:34 +05:30
Nabin Hait
0d230afd22
bumped to version 8.0.8
2017-04-06 17:02:03 +06:00
Makis Etzoglou
a906b3f11c
add delivery date to print format Fix #8111
2017-04-06 15:47:52 +05:30
Kanchan Chauhan
aa6f00c403
Added default 'All' option to filters to differentiate all and empty filter
2017-04-06 15:22:18 +05:30
Nabin Hait
d681c88d79
validate returned qty only if there is reference qty
2017-04-06 15:20:45 +05:30
Javier Wong
fc11fce990
[enhancement] Changed Issue Description and Resolution to Text Editor ( #8346 )
2017-04-06 14:56:44 +05:30
Rohit Waghchaure
faf51d91b6
[fix] stock qty issue in purchase trends report
2017-04-05 14:53:26 +05:30
Rushabh Mehta
08a42e00ae
[fix] salary slip eval, remove access to globals, #8313
2017-04-05 14:52:22 +05:30
Nabin Hait
549a2827e5
Merge pull request #8300 from rohitwaghchaure/customer_edit_issue_v8
...
[fix] Customer edit issue in offline POS
2017-04-05 14:51:44 +05:30
Rushabh Mehta
9264313f0e
[fix] ordering for Edit Posting Time check
2017-04-05 12:49:01 +05:30
Nabin Hait
8013d1813a
Merge pull request #8320 from manassolanki/newsl
...
Route to newsletter listview
2017-04-05 12:33:14 +05:30
Rushabh Mehta
ffc807cd57
[minor] check below posting date in delivery note
2017-04-05 12:27:41 +05:30
Manas Solanki
ba6559c2e9
Route to newsletter listview
2017-04-05 11:52:23 +05:30
Nabin Hait
93a990f006
bumped to version 8.0.7
2017-04-04 12:16:47 +06:00
Rohit Waghchaure
2861955632
[fix] Customer edit issue in offline POS
2017-04-04 09:59:29 +05:30
Faris Ansari
0d114b4c31
Add image
field to fetch in Customer List
2017-04-03 21:21:50 +05:30
Nabin Hait
fcf34dc570
Merge pull request #8295 from saurabh6790/demo_fix
...
[fix] demo script for setup data
2017-04-03 17:56:47 +05:30
Nabin Hait
6f038bc1f3
Validate total advance against grand total considering write off amount
2017-04-03 17:56:05 +05:30
Nabin Hait
9300013acc
Validate total advance against grand total considering write off amount
2017-04-03 17:35:58 +05:30
Nabin Hait
8d8cba7faa
Validate total advance against grand total considering write off amount
2017-04-03 17:26:32 +05:30
Nabin Hait
2d132e32aa
Function name changed in company
2017-04-03 17:26:32 +05:30
Saurabh
2e47654f43
[fix] demo script for setup data
2017-04-03 17:25:55 +05:30
Nabin Hait
17ddd8f389
bumped to version 8.0.6
2017-04-03 13:48:13 +06:00
Nabin Hait
c469f2c954
Get POS profile fix
2017-04-03 13:01:11 +05:30
Nabin Hait
731efe3a95
Minor fix in gross profit report
2017-04-03 12:11:36 +05:30
Nabin Hait
2c892c7e7f
Indentation fixed in gross profit report
2017-04-03 12:05:35 +05:30
Nabin Hait
31334328ed
bumped to version 8.0.5
2017-04-01 19:32:55 +06:00
Rushabh Mehta
0d6db6c42c
[fix] add user default role
2017-03-31 23:02:19 +05:30
Nabin Hait
d991c8666c
bumped to version 8.0.4
2017-03-31 18:49:57 +06:00
Nabin Hait
85d1c07519
Merge pull request #8269 from rohitwaghchaure/v8_documentation
...
[Documentation] Added for custom roles for page and report, fixed some broken images
2017-03-31 18:04:44 +05:30
Nabin Hait
04ab7dfd2f
Update role-permisison-for-page-and-report.md
2017-03-31 18:04:15 +05:30
Faris Ansari
eae30e5642
[fix] Show project title in kanban view ( #8268 )
...
- frappe/erpnext#8232
2017-03-31 17:46:12 +05:30
Nabin Hait
065302298f
Merge pull request #8261 from rohitwaghchaure/pull_project_from_bom_to_po
...
[enhance] Get project from bom on production order
2017-03-31 17:40:43 +05:30
Nabin Hait
b15d999147
Merge branch 'develop' into gross_profit_issue_v_8
2017-03-31 17:39:45 +05:30
Rushabh Mehta
4b0381c820
[fix] tests
2017-03-31 17:36:48 +05:30
Rushabh Mehta
f0b4562a95
[refactor] move purchase_common.js -> public/js/controllers/buying.js
2017-03-31 17:36:48 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Rohit Waghchaure
67a3e65f08
[Documentation] Added for custom roles for page and report, fixed some broken images
2017-03-31 17:22:58 +05:30
Rushabh Mehta
dc89916aa9
[fix] salary component fix for abbr
2017-03-31 17:20:57 +05:30
Rushabh Mehta
9d9cb8b7b1
Revert "Add link field Package Code ( fixes #8094 )"
2017-03-31 14:35:23 +05:30
Rohit Waghchaure
e7c0188732
[enhance] Get project from bom on production order
2017-03-31 13:40:06 +05:30
Rohit Waghchaure
34b1dba9aa
[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report
2017-03-31 12:44:10 +05:30
Nabin Hait
c040015bb5
Used db_update in patch to bypass validate and on_update method
2017-03-31 11:58:19 +05:30
Rushabh Mehta
b66edd19ca
[minor] refactor transaction.js
2017-03-31 10:50:58 +05:30
Ricardo Johann
033e2fa8b6
changed accumulated header
2017-03-31 02:18:54 -03:00
Nabin Hait
79fddcfac1
bumped to version 8.0.3
2017-03-31 00:20:27 +06:00
Revant Nandgaonkar
3d5bdeb90d
[Fix] patch v7_2.contact_address_links
2017-03-30 23:14:58 +05:30
Revant Nandgaonkar
d07c041125
[Fix] Addresses linked back to Lead
2017-03-30 23:14:58 +05:30
Nabin Hait
b207a0542a
bumped to version 8.0.2
2017-03-30 20:22:42 +06:00
Nabin Hait
620bde7144
Updated modified date to reload sales uom
2017-03-30 19:50:45 +05:30
Nabin Hait
896fd1aca7
bumped to version 8.0.1
2017-03-30 20:05:51 +06:00
Nabin Hait
e503f68ec7
Merge pull request #8229 from rohitwaghchaure/pos_highlight_issue
...
[fix] POS cart item's highlighted issue
2017-03-30 19:26:33 +05:30
Rohit Waghchaure
a86bb69adf
[fix] POS cart item's highlighted issue
2017-03-30 19:16:38 +05:30
Nabin Hait
3b5b081ac4
bumped to version 8.0.0
2017-03-30 18:58:20 +06:00
Nabin Hait
d00218ece3
Merge pull request #8227 from manassolanki/contact_report
...
Addition of few more fields in student contact report
2017-03-30 17:43:33 +05:30
Nabin Hait
93c15383b8
[translations]
2017-03-30 16:57:19 +05:30
Nabin Hait
3c2be33adf
Merge pull request #8226 from mbauskar/item-varient-fix
...
[minor] make varient fixes in item.js
2017-03-30 16:05:34 +05:30
Manas Solanki
4be52d8a20
Addition of few more fields in student contact report
2017-03-30 16:04:26 +05:30
Nabin Hait
6bd791742f
Change log for version 8
2017-03-30 16:00:43 +05:30
mbauskar
90d82be966
[minor] make varient fixes in item.js
2017-03-30 15:36:46 +05:30
Nabin Hait
eb6fa5b70c
Update attendance.py
2017-03-30 14:11:47 +05:30
Nabin Hait
1f6bd0ad37
Fixed merge conflict
2017-03-30 13:15:22 +05:30
Nabin Hait
a9bef56a94
bumped to version 7.2.32
2017-03-30 13:44:34 +06:00
Nabin Hait
a24f8dbb8f
Merge branch 'develop' into update-disbursment-date
2017-03-30 13:06:28 +05:30
Kanchan Chauhan
37d8f643cc
Read permissions to Employee on Employee Loan and Loan Type
2017-03-30 13:05:49 +05:30
Kanchan Chauhan
400c6f5aef
Disbursement Date fetched from JV - Employee Loan
2017-03-30 13:04:05 +05:30
mbauskar
07e6bdd4f2
[minor] check employee date of joining before marking the employee attendance
2017-03-30 12:52:29 +05:30
Kanchan Chauhan
b87c174898
Employee Loan Dashboard
2017-03-30 12:51:46 +05:30
CH
99752e58ec
VAT rates update for France
2017-03-30 12:45:08 +05:30
Kanchan Chauhan
5ac740b3cb
[Fix] From Date and To Date not to be auto calculated for Timesheet Salary
2017-03-30 12:44:28 +05:30
Manas Solanki
3528d08178
[Fix] Fix in program enrollment tool and report
2017-03-30 12:21:49 +05:30
Nabin Hait
f912317fae
Stock Balance: Show records based on all child item groups if filters set based on group node
2017-03-29 18:08:10 +05:30
Nabin Hait
e2fef16d78
Made join_table query optional based on item group filter
2017-03-29 17:51:05 +05:30
Javier Wong
41bf1ba7b3
[enhancement] Stock Balance Report - Added Item Group Filter
2017-03-29 17:51:05 +05:30
Ricardo Johann
3d1434afe7
Export total labels
2017-03-29 17:44:17 +05:30
addymuliady
0dd00eb418
Update accounts-settings.md
2017-03-29 17:40:01 +05:30
Nabin Hait
64e9c4abf4
Changed label of hide_tax_id field
2017-03-29 17:39:08 +05:30
Makis Etzoglou
82e6bc45e4
tax_id add to Sales Order, Delivery Note, and Sales Invoice
2017-03-29 17:39:08 +05:30
Saurabh
a5ddeb44e7
[fix] remove integraton service reference from documentation
2017-03-29 17:32:04 +05:30
Kanchan Chauhan
35b12e2ea6
Company in Leave Control Panel
2017-03-29 17:30:56 +05:30
mbauskar
de98ff6bb9
[minor] hide the stock details section if update_stock is unchecked
2017-03-29 17:29:58 +05:30
rohitwaghchaure
afa93c624b
[fix] Reserved qty is not calculating properly in BIN for multi sales UOM ( #8203 )
2017-03-29 17:29:20 +05:30
Manas Solanki
8519b4bfe4
Changes in Program Enrollment and Report for Student Contact Details ( #8176 )
...
* Added the student house name in the program enrollment
* added report for the student contact details
* Enabled tag in Student master and fix in student enrollment tool
* [Fix] School House and Report
2017-03-29 16:07:31 +05:30
Nabin Hait
79731360ed
Merge pull request #8126 from kickapoo/issue8094
...
Add link field Package Code (fixes #8094 )
2017-03-28 20:48:39 +05:30
Nabin Hait
fede6d8fbe
Updated modified date for production order
2017-03-28 20:42:42 +05:30
Stavros Anastasiadis
b9bbb3c3db
Add link field Package Code ( fixes #8093 )
2017-03-28 16:09:52 +03:00
Neil Trini Lasrado
193c8919b9
Fixed issue with misleading error message on Stock Entry creation of Serialized Items
2017-03-28 17:43:23 +05:30
Nabin Hait
d1f6cc88f2
Required items table in Production order
2017-03-28 17:08:40 +05:30
Nabin Hait
dac525433c
Merge pull request #8178 from nabinhait/develop
...
Patch order changed for multiple uoms in sales cycle
2017-03-28 16:55:57 +05:30
Faris Ansari
49a3d6d8f6
Update POS screenshot
2017-03-28 16:17:30 +05:30
Nabin Hait
6c3eb36c35
Merge branch 'develop' into customs_tariff_number
2017-03-28 13:51:44 +05:30
Nabin Hait
da749f716b
Merge pull request #8172 from rohitwaghchaure/credit_note_serial_no_issue
...
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 13:49:32 +05:30
Nabin Hait
2cf5ca28f6
Merge pull request #8173 from nabinhait/hotfix
...
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
2017-03-28 13:49:09 +05:30
Nabin Hait
621dcc3c84
Patch order changed for multiple uoms in sales cycle
2017-03-28 13:45:56 +05:30
Nabin Hait
77b2fef41e
Fixed test cases
2017-03-28 13:39:26 +05:30
Nabin Hait
d20f8585ae
Merge branch 'manufacturer_childtable' of https://github.com/dottenbr/erpnext into dottenbr-manufacturer_childtable
2017-03-28 13:31:28 +05:30
Rohit Waghchaure
d7908f8e3a
[fix] sales order with status closed fetching on production planning tool
2017-03-28 12:30:23 +05:30
Nabin Hait
77c970549b
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
2017-03-28 12:20:31 +05:30
Rohit Waghchaure
5ecbaa408b
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 12:09:07 +05:30
Nabin Hait
0329c0ffab
Test case fixed for production order
2017-03-27 19:11:45 +05:30
Nabin Hait
5b60ef2dce
Fetch operations from all sub-assembly BOMs in Pro Order if multi-level BOM is checked
2017-03-27 16:29:51 +05:30
Nabin Hait
8bf58367b8
Fixed merge conflict
2017-03-27 12:30:01 +05:30
Nabin Hait
70c3f79d12
bumped to version 7.2.31
2017-03-27 12:57:38 +06:00
Nabin Hait
9c8159be8f
Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue
...
[fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos
2017-03-27 12:25:18 +05:30
Nabin Hait
68fb20b811
Merge pull request #8131 from rohitwaghchaure/purchase_analytics_issue
...
[fix] Purchase analytics report not loading
2017-03-27 12:24:46 +05:30
Dominik Ottenbreit
fc9ed4da24
Add Customs Tariff Number
2017-03-24 15:53:03 +01:00
Dominik Ottenbreit
ea617da277
fix translations that have to do with term 'close' which was not well translated
2017-03-24 15:24:55 +01:00
Dominik Ottenbreit
6eb202ef3a
fix patch after test, fix variant based on manufacturer, add json for item_manufacturer
2017-03-24 14:49:52 +01:00
Dominik Ottenbreit
3938c61996
migrate from manufacturer to manufacturer childtable
2017-03-24 14:24:34 +01:00
Rohit Waghchaure
f74b02140c
[fix] Purchase analytics report not loading
2017-03-24 17:37:02 +05:30
Rohit Waghchaure
b719dc53fc
[fix] customer edit and numeric keypad visibility issue in the pos
2017-03-24 17:03:50 +05:30
Nabin Hait
00b04ed61e
Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart
...
Show qty in Shopping Cart
2017-03-24 13:14:03 +05:30
Nabin Hait
bf2a7efca4
Account name changed in standard chart of accounts
2017-03-24 13:01:35 +05:30
Nabin Hait
214ea8f2c8
Merge pull request #8119 from robulik/develop
...
[minor] fixes of translatable strings in web pages
2017-03-24 12:59:02 +05:30
Kanchan Chauhan
a844040781
Show qty in Shopping Cart
2017-03-23 18:22:02 +05:30
Robert Kirschner
b8f5148a44
[minor] fix: translatable title, h1, button on product_search page. Address row in web view has translatable address type
2017-03-23 13:43:26 +01:00
Nabin Hait
9ba1be60b7
Merge pull request #8039 from netchampfaris/pos-ui-fix
...
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-23 17:14:39 +05:30
Nabin Hait
2aafdd622b
Merge pull request #8047 from KanchanChauhan/warehouse-for-dropship
...
[Fix] Warehouse not required for Dropship
2017-03-23 17:06:18 +05:30
Nabin Hait
b6b97f25d0
Merge pull request #8048 from KanchanChauhan/bom-based-on-project
...
Project filter in BOM selection in Production Order
2017-03-23 17:04:53 +05:30
Nabin Hait
4a8a62a202
Merge pull request #8053 from umairsy/video-pages
...
updated erpnext-learn pages
2017-03-23 17:02:34 +05:30
Nabin Hait
d25e314ccb
Merge pull request #8054 from rohitwaghchaure/purchase_return_issue_invoice
...
[fix] Quantity is not copying in the Received Qty during making of debit note from the purchase invoice
2017-03-23 17:01:58 +05:30
Nabin Hait
f44f04e33a
Merge pull request #8063 from khrlzhfr/patch-1
...
Update standard_chart_of_accounts.py
2017-03-23 17:01:34 +05:30
Robert Kirschner
db068ac6c4
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-03-23 12:29:43 +01:00
Nabin Hait
c7dc838306
Merge pull request #8068 from rohitwaghchaure/asset_depreciation_issue
...
[fix] Precision issue during making of depreciation schedule
2017-03-23 16:59:12 +05:30
Nabin Hait
5168286ea0
Merge pull request #8072 from lb-/patch-1
...
Update the-champion.md - grammar
2017-03-23 16:58:19 +05:30
Nabin Hait
8373b8e50d
Merge pull request #8075 from netchampfaris/asset-image-fix
...
[fix] asset image in image view
2017-03-23 16:58:05 +05:30
Nabin Hait
33f2b659e4
Merge pull request #8079 from robulik/develop
...
[fix] selecting new address in cart webpage unchecks previously checked
2017-03-23 16:52:39 +05:30
Nabin Hait
8de911b5b4
Merge pull request #8086 from KanchanChauhan/read-perm-to-guest
...
[Minor] Guest should have read permissions on Job Openings
2017-03-23 16:50:45 +05:30
Robert Kirschner
d162eb367c
[minor] fix translation strings in cart web view
2017-03-23 12:18:24 +01:00
Robert Kirschner
0af93a782d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-03-23 12:10:46 +01:00
Nabin Hait
46bccb55c5
Merge pull request #8080 from rmehta/item-variants-by-mfg
...
[feature] ability to have variants based on manufacturer
2017-03-23 16:29:41 +05:30
Nabin Hait
422ef584fa
Merge pull request #8090 from KanchanChauhan/date-span-in-salary-slip
...
[Minor] From date, To date based on Payroll Frequency
2017-03-23 16:16:51 +05:30
Nabin Hait
b132428184
Merge pull request #8091 from mbauskar/cart-address-fixes
...
[minor] fixed shipping and billing address issue in cart
2017-03-23 16:16:11 +05:30
Rohit Waghchaure
57f35a25a1
[fix] UnpickleError, removed _ method from the argument of the function
2017-03-23 14:55:52 +05:30
Faris Ansari
3011006ff2
Merge pull request #8097 from frappe/netchampfaris-documentation-1
...
Add new screenshots for Workflows documentation
2017-03-22 17:50:17 +05:30
Faris Ansari
1e7f739c84
Add new screenshots for Workflows documentation
2017-03-22 17:48:51 +05:30
Faris Ansari
7fbc1c2161
Update Workflows
...
Add new images
2017-03-22 17:45:52 +05:30
mbauskar
67e3e32dd6
[minor] fixed shipping and billing address issue in cart
2017-03-22 16:14:43 +05:30
Kanchan Chauhan
076e9d6af8
[Minor] From date, To date based on Payroll Frequency
2017-03-22 16:07:03 +05:30
Robert Kirschner
c6b52a321e
update on cart.js pull request feedback
2017-03-22 08:10:30 +01:00
Kanchan Chauhan
730ad5a507
[Minor] Guest should have read permissions on Job Openings
2017-03-22 12:37:38 +05:30
Rushabh Mehta
43583d6497
Update item.js
2017-03-21 17:49:53 +01:00
Rushabh Mehta
a07c43fd68
[feature] ability to have variants based on manufacturer
2017-03-21 17:48:34 +01:00
Robert Kirschner
0a33d4ffc5
[fix] selecting new address in cart web page unchecks previously checked address
2017-03-21 14:52:59 +01:00
Rohit Waghchaure
6ee91ec9c6
on selection of row highlight the background in the cart
2017-03-21 15:55:09 +05:30
Faris Ansari
e1acb766ac
[fix] asset image in image view
2017-03-21 14:18:30 +05:30
LB (Ben Johnston)
71f4fbf467
Update the-champion.md - grammar
2017-03-21 12:50:17 +07:00
Rohit Waghchaure
b69d311268
[fix] precision issue during making of depreciation schedule
2017-03-20 16:30:34 +05:30
Khairil Zhafri
4d6d456a0d
Update standard_chart_of_accounts.py
...
Minor spelling edits
2017-03-20 00:15:34 +08:00
Rohit Waghchaure
414c0ab3bb
[fix] Quantity is not copying in the Received Qty during making of debit note
2017-03-17 17:19:17 +05:30
Umair Sayyed
024896d806
updated erpnext-learn pages
2017-03-17 12:55:01 +05:30
rohitwaghchaure
2b9c95a940
Merge pull request #8043 from rohitwaghchaure/pos_issue_v8
...
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 17:56:20 +05:30
Kanchan Chauhan
7cf1a1d84b
Project filter in BOM selection in Production Order
2017-03-16 17:09:37 +05:30
Kanchan Chauhan
6f7457a1b0
[Fix] Warehouse not required for Dropship
2017-03-16 16:03:41 +05:30
Rohit Waghchaure
75177c0e35
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 15:47:25 +05:30
Faris Ansari
d79f239001
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-16 12:18:35 +05:30
mbauskar
27efc91db0
[minor] make item code mandatory if update_stock is selected
2017-03-15 18:57:18 +05:30
Manas Solanki
ad2dc2c747
[Fix] Enrolling the student
2017-03-15 18:22:57 +05:30
Rushabh Mehta
f340e19ea7
[minor] field re-arrangements in sales invoice, purchase invoice, stock reco
2017-03-15 15:12:43 +05:30
Nabin Hait
56f650f342
Merge branch 'master' into develop
2017-03-15 11:28:07 +05:30
Nabin Hait
1157ee365b
bumped to version 7.2.30
2017-03-15 11:58:06 +06:00
Nabin Hait
ee7b4f2882
Merge pull request #8016 from rmehta/posting-date-option
...
[feature] posting date, time is always current unless explicitly set
2017-03-15 11:22:04 +05:30
Nabin Hait
505ed25f10
Merge pull request #8017 from nabinhait/develop
...
Field order changed for 'Qty as per Stock UOM'
2017-03-14 22:39:36 +05:30
Nabin Hait
1ba71a0b3a
Merge pull request #8018 from mbauskar/develop
...
[minor] custom script to create issue, lead, opportunity from email
2017-03-14 22:39:26 +05:30
Nabin Hait
79bce2a71d
Merge pull request #8019 from rohitwaghchaure/pos_serial_no_issue
...
[fix] User sales one serial number multiple time from the POS
2017-03-14 22:38:28 +05:30
Rushabh Mehta
4f3da42b75
[fixes] for tests
2017-03-14 21:29:55 +05:30
Rushabh Mehta
131866a11a
[fixes] for tests
2017-03-14 21:06:15 +05:30
Rushabh Mehta
82c258948d
[fixes] for recurring and tests
2017-03-14 19:13:39 +05:30
Rohit Waghchaure
e259a9b068
[fix] User sales one serial number multiple time from the POS
2017-03-14 19:05:21 +05:30
mbauskar
f54b1047b8
[minor] custom script to create issue, lead, opportunity from email
2017-03-14 17:57:47 +05:30
Nabin Hait
3d731df7e3
Field order changed for 'Qty as per Stock UOM'
2017-03-14 17:24:57 +05:30
Rushabh Mehta
f6dee248ee
Update company.json
2017-03-14 17:10:01 +05:30
Rushabh Mehta
6d4a52562b
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rushabh Mehta
6b53792aea
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rohit Waghchaure
faedf8274c
[fix] gross profit permission issue
2017-03-14 14:56:24 +05:30
Nabin Hait
6a053a989e
Merge pull request #8014 from rohitwaghchaure/contact_issue_for_website_generator
...
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
2017-03-14 14:46:48 +05:30
Saurabh
0d47d51407
[fix] modified payment request to cope with new payment structure ( #7957 )
...
* [fix] modified payment request to cope with new payment structure
* [fix] moved payment gateway doctype from accounts to core
2017-03-14 14:46:05 +05:30
Rohit Waghchaure
11fa7a9311
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
2017-03-14 13:26:10 +05:30
Manas Solanki
2922660b34
[Fix] Student attendance tool- Handling double-click on button
2017-03-14 12:50:58 +05:30
rohitwaghchaure
27e86201fc
Merge pull request #8007 from rohitwaghchaure/pos_profile_issue
...
[fix] Value assignment issue for country field in pos profile
2017-03-14 00:22:23 +05:30
Rohit Waghchaure
cc034a8983
[fix] Value assignment issue for country in the pos profile
2017-03-13 22:44:48 +05:30
rohitwaghchaure
0216f6e6eb
Merge pull request #7995 from saurabh6790/restrict_negative_qty_in_pr
...
[fix] validate negative quantity while creating purchase receipt
2017-03-13 18:24:24 +05:30
Nabin Hait
26ed675240
Merge pull request #7996 from netchampfaris/ui-fixes
...
[ui] show assignees in gantt popup frappe/erpnext#6916
2017-03-13 17:22:56 +05:30
Saurabh
4f4d0a8369
[fix] validate negative quantity while creating purchase receipt
2017-03-13 15:37:47 +05:30
Faris Ansari
df65d21225
[ui] show assignees in gantt popup frappe/erpnext#6916
2017-03-13 14:52:56 +05:30
Nabin Hait
86cb0cc010
Merge pull request #7991 from mbauskar/develop
...
[minor] display campaign field only if source is Campaign
2017-03-13 11:19:59 +05:30
mbauskar
7f42e90832
[minor] display campaign field only if source is Campaign
2017-03-12 21:57:52 +05:30
Nabin Hait
1ed8bc4c36
Gross Profit report: Consider Sales team table only if grouped by sales person
2017-03-12 17:10:41 +05:30
Nabin Hait
b2a8482cc5
In Student Sibling table, the current student id should not appear as sibling.
2017-03-12 16:55:05 +05:30
Nabin Hait
fb4b8d926f
Company based on exising company fix
2017-03-12 16:55:05 +05:30
Nabin Hait
ae205f878a
Set default taxes and charges while creating quotation from opportunity
2017-03-12 16:55:05 +05:30
Nabin Hait
d0d22ff203
copy letter head from invoice to payment entry
2017-03-12 16:55:05 +05:30
Nabin Hait
6923397ef6
Show net total in salary slip log in Process Payroll. Fixed #7986
2017-03-12 16:55:05 +05:30
Nabin Hait
c5204f56e2
Merge pull request #7909 from KanchanChauhan/employee-loan-jv
...
JV on submitting Employee Loan
2017-03-12 16:50:48 +05:30
Nabin Hait
132193309c
Merge pull request #7952 from KanchanChauhan/multiple-salary-fixes
...
Multiple Salary Fixes
2017-03-12 16:48:11 +05:30
Nabin Hait
d402829d17
Merge pull request #7980 from rohitwaghchaure/target_bounty_redesign
...
[Enhancement] POS Redesign and new features
2017-03-12 16:47:26 +05:30
Nabin Hait
fd9b2467d6
Merge pull request #7966 from rohitwaghchaure/item_variant_issue_for_nuermic
...
[Fix] Item variants broken when using naming series for items and vriants of numeric value
2017-03-12 16:34:40 +05:30
mbauskar
124cf14429
[minor] ignore lead addresses delete query if address against lead not found
2017-03-11 16:02:20 +05:30
Rohit Waghchaure
0169341917
[Fix] Item variants broken when using naming series for items and vriants of numeric value
2017-03-10 19:40:08 +05:30
Rohit Waghchaure
87fa59a710
[Fix] Customer delete, customer edit functionality, added country field in the pos profile
2017-03-10 19:37:02 +05:30
Faris Ansari
1fe1518398
[pos] ui cleanup
2017-03-10 17:00:43 +05:30
Rohit Waghchaure
6068aecc2e
minor fix
2017-03-10 17:00:43 +05:30
Faris Ansari
07c9f35779
ui cleanup
2017-03-10 17:00:42 +05:30
Faris Ansari
45510109b6
[pos] cleanup
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
017f5005e0
fixed pos numeric keypad functionality
2017-03-10 17:00:42 +05:30
Faris Ansari
339d9c954a
minor changes
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
1312fe31a9
Provision to edit customer and address details
2017-03-10 17:00:42 +05:30
Faris Ansari
adcb3c62fa
wip
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
3b5a412a9c
offline email for POS
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
56a7974b58
added event on numeric keypad
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
86ab6a93b4
[Enhancement] POS, numeric keypad
2017-03-10 17:00:41 +05:30
Faris Ansari
1f261a8695
UI changes
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
b5097ec161
offline email for POS
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
f0c7ba4b1f
added event on numeric keypad
2017-03-10 17:00:40 +05:30
Rohit Waghchaure
e30f83a8af
[Enhancement] POS, numeric keypad
2017-03-10 17:00:40 +05:30
Rushabh Mehta
83aa5ee3df
[messages] cleanup
2017-03-10 12:47:29 +05:30
Rushabh Mehta
db206f2d10
[minor] develop_version
2017-03-10 09:39:31 +05:30
Rushabh Mehta
868bb26e24
[sample] add help for sample tasks and make them into notifications
2017-03-09 18:11:11 +05:30
Kanchan Chauhan
37a57813fa
Multiple Salary Fixes
2017-03-09 13:00:35 +05:30
Rushabh Mehta
aea1c2a1e3
[minor] allow sales order delivery date before order date
2017-03-09 12:46:51 +05:30
Kanchan Chauhan
ffd1f112e6
JV on submitting Employee Loan
2017-03-09 12:21:37 +05:30
Nabin Hait
733855a4c3
Merge pull request #7956 from manassolanki/sibling
...
[Fixes] School
2017-03-09 11:04:38 +05:30
Nabin Hait
d22bb682a5
Merge pull request #7960 from rohitwaghchaure/material_request_issue_for_po
...
[Fix] Material Request to Production Order not working
2017-03-09 10:57:26 +05:30
Nabin Hait
f73a44aa8d
Update material_request.py
2017-03-09 10:57:00 +05:30
Rohit Waghchaure
02fb5880fe
[Fix] Material Request to Production Order not working
2017-03-08 18:38:12 +05:30
Kanchan Chauhan
a64f53801b
[Minor] Label change in Expense Claim
2017-03-08 16:59:49 +05:30
Manas Solanki
631fab012f
[Fix] Student attendance tool
2017-03-08 14:44:52 +05:30
Manas Solanki
d41836b386
[Fix] Student Sibling
2017-03-08 14:44:52 +05:30
Nabin Hait
52daaca885
Fixed merge conflict
2017-03-08 14:30:38 +05:30
Nabin Hait
27c4fdc2df
bumped to version 7.2.29
2017-03-08 15:00:12 +06:00
Nabin Hait
804c4fc4a7
Merge pull request #7951 from rohitwaghchaure/purchase_return_issue
...
[Fix] Purchase return issue
2017-03-08 14:28:55 +05:30
mbauskar
02198ec8b0
removed the test_clear_blank_rows test case from JE
2017-03-08 12:34:36 +05:30
Rushabh Mehta
b9cdb05934
[minor] renamed portal hook
2017-03-08 12:34:03 +05:30
Nabin Hait
33fb6ae323
Fixed merge conflict
2017-03-08 11:18:15 +05:30
Nabin Hait
f967206523
bumped to version 7.2.28
2017-03-08 11:46:00 +06:00
Rohit Waghchaure
d05a8737f9
[Fix] Purchase return issue
2017-03-08 10:30:23 +05:30
Nabin Hait
1af471a16f
Merge pull request #7938 from netchampfaris/task-list
...
[gantt] show task project in popup
2017-03-07 19:41:52 +05:30
Nabin Hait
f822b875ba
Merge pull request #7941 from nabinhait/v8_fixes
...
Set new name in warehouse_name on rename of warehosue
2017-03-07 17:16:44 +05:30
Nabin Hait
961bdc3743
Set new name in warehouse_name on rename of warehosue
2017-03-07 15:02:34 +05:30
Abdulla P I
cbe035b08a
Only enabled user to be fetched
2017-03-07 13:34:08 +05:30
Faris Ansari
0e4b924f59
[gantt] show task project in popup
2017-03-07 12:01:39 +05:30
mbauskar
c03f275e7a
[minor] allowed the credit and debit amount to be 0 in JE
2017-03-07 11:59:55 +05:30
Nabin Hait
f5a9c8ecf2
Merge pull request #7936 from rohitwaghchaure/financial_statement_issue
...
Minor fix
2017-03-07 00:27:53 +05:30
Rohit Waghchaure
9f4317e9b8
minor fix
2017-03-06 23:42:45 +05:30
Rohit Waghchaure
0bb434af3f
minor fix in patch
2017-03-06 18:52:34 +05:30
Nabin Hait
b3ffd6b282
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
...
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Nabin Hait
fe876c0805
Test case fixed for multiple uom in selling
2017-03-06 16:41:13 +05:30
Nabin Hait
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Nabin Hait
0697d62603
Merge pull request #7931 from KanchanChauhan/job-applicant-fix
...
[Fix] Candidate can apply to multiple jobs
2017-03-06 16:38:00 +05:30
Rohit Waghchaure
611a70a12a
changes in the report roles
2017-03-06 16:36:46 +05:30
Kanchan Chauhan
8411be7720
[Fix] Candidate can apply to multiple jobs
2017-03-06 14:40:43 +05:30
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +05:30
Rohit Waghchaure
312498060f
changed doctype name userrole to has role
2017-03-06 14:24:39 +05:30
Rohit Waghchaure
d59f8b32cd
changed user_roles to roles
2017-03-06 14:24:39 +05:30
S. Vigneux
ff2d5d8ad9
Update batch.md
...
The practice=> The practice
2017-03-05 12:44:03 -05:00
Nabin Hait
a07c3193cf
Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos
...
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
2017-03-04 18:32:40 +05:30
Rohit Waghchaure
a31ffbc745
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
2017-03-03 16:28:49 +05:30
Rohit Waghchaure
f8aa6ed46b
removed fiscal year and month from the print
2017-03-02 17:51:15 +05:30
mbauskar
91c6ffde86
[minor] fixes contact field set query for opportunity
2017-03-02 17:29:16 +05:30
Nabin Hait
78a650062c
Update company.json
2017-03-02 14:48:49 +05:30
Nabin Hait
57a47a83a0
Merge pull request #7887 from rohitwaghchaure/capacity_planning
...
[Fix] Pull operation on production order, when making from sales order
2017-03-02 14:17:09 +05:30
Nabin Hait
a0fb3e5128
Merge pull request #7888 from KanchanChauhan/payroll-fix
...
[Fix] JV entry for Employee Loan only if Loan exists
2017-03-02 14:15:59 +05:30
Nabin Hait
42bc399f2a
Merge pull request #7890 from KanchanChauhan/hr-page
...
[Minor] Employee Loan Management moved up in HR Page
2017-03-02 14:14:04 +05:30
Nabin Hait
bc10ea897d
Merge pull request #7893 from pratu16x7/crm-docs
...
CRM docs update
2017-03-02 14:13:19 +05:30
Kanchan Chauhan
cfb0adff98
[Minor] Removed Paid status from Salary Slip
2017-03-02 12:59:35 +05:30
Nabin Hait
834d616c60
Merge branch 'master' into develop
2017-03-02 12:38:15 +05:30
Nabin Hait
1cc7024cb4
bumped to version 7.2.27
2017-03-02 13:08:14 +06:00
Rushabh Mehta
7067ff026a
[minor] add progress in desktop help message
2017-03-02 11:14:09 +05:30
Rushabh Mehta
e7900b24a0
[minor] add progress in desktop help message
2017-03-02 11:13:18 +05:30
Saurabh
b3134d34fa
[fix] add from date field to salary structure in setup demo data
2017-03-02 08:43:08 +05:30
Nabin Hait
258c8199fb
Merge pull request #7842 from superlack/develop
...
Add Sales Orders to Project costing and billing section
2017-03-01 17:20:23 +05:30
pratu16x7
4e71337f3d
fix lead, customer, opportunity pages
2017-03-01 04:02:50 +05:30
Nabin Hait
18b7364a81
Merge branch 'master' into develop
2017-02-28 18:56:26 +05:30
Nabin Hait
db2aefa3a6
bumped to version 7.2.26
2017-02-28 19:26:25 +06:00
Rushabh Mehta
f8b19e07cf
[minor] activation messages only for non activated users
2017-02-28 18:54:07 +05:30
Kanchan Chauhan
639eebdae5
[Minor] Employee Loan Management moved up in HR Page
2017-02-28 18:01:07 +05:30
Kanchan Chauhan
e6254b96c4
[Fix] JV entry for Loan only if Loan exists
2017-02-28 17:42:09 +05:30
Rohit Waghchaure
2c2ce8c557
[Fix] Pull operation on production order, when making from sales order
2017-02-28 17:12:18 +05:30
Nabin Hait
6bbf141d57
Merge branch 'develop' into link_mrs
2017-02-28 15:55:35 +05:30
Nabin Hait
38c7ad2c69
Update supplier_quotation.json
2017-02-28 15:53:10 +05:30
Nabin Hait
491d2ad140
Update request_for_quotation.json
2017-02-28 15:52:43 +05:30
Nabin Hait
365ed5dea9
Update purchase_order.json
2017-02-28 15:51:00 +05:30
Nabin Hait
fd37395995
Merge pull request #7878 from netchampfaris/lead-fix
...
fix date compare in contact_date
2017-02-28 15:37:42 +05:30
Faris Ansari
0ded707397
fix date compare in contact_date
2017-02-27 21:51:46 +05:30
superlack
62d7ba0afd
Update project.py
2017-02-27 07:00:30 -08:00
Nabin Hait
cda28ceeec
[translations]
2017-02-27 17:46:47 +05:30
Nabin Hait
409062b8a4
Merge pull request #7869 from KanchanChauhan/dependent-tasks
...
Dependent task dates gets updated with parent dates
2017-02-27 17:34:09 +05:30
Nabin Hait
631ecad985
Merge pull request #7875 from KanchanChauhan/employee-loan-fixes
...
[Fix] Multiple fixes in Employee Loan
2017-02-27 17:28:20 +05:30
Nabin Hait
3ddc26060a
Merge pull request #7876 from KanchanChauhan/salary-slip-fix
...
[Fix] Update totals on salary component deletion
2017-02-27 17:26:39 +05:30
Kanchan Chauhan
c02745c826
[Fix] Update totals on salary component deletion
2017-02-27 17:21:41 +05:30
Kanchan Chauhan
a13adc0e6b
[Fix] Multiple fixes in Employee Loan
2017-02-27 16:56:00 +05:30
Nabin Hait
b9741b6ed5
Merge branch 'master' into develop
2017-02-27 15:41:44 +05:30
Nabin Hait
b99a38d6ae
bumped to version 7.2.25
2017-02-27 16:11:43 +06:00
Nabin Hait
a2afc4e11c
Update activation.py
2017-02-27 15:39:29 +05:30
Kanchan Chauhan
e76685d925
Dependent task dates gets updated with parent dates
2017-02-27 14:55:03 +05:30
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
Nabin Hait
e0d661f433
Merge branch 'hotfix'
2017-02-27 14:31:10 +05:30
Nabin Hait
79c5ee0a65
bumped to version 7.2.24
2017-02-27 15:01:10 +06:00
Nabin Hait
704b6a3e1f
Merge pull request #7756 from mlisb0n/master
...
[Translation] Revised and updated all translations to meet european portuguese business/accounting terminology
2017-02-27 14:10:51 +05:30
Rohit Waghchaure
2087e574aa
[Fix] Serial nos not pulling on the delivery note, for language spanish add serial no button was not working
2017-02-27 13:43:04 +05:30
Nabin Hait
c238016aff
Merge pull request #7871 from KanchanChauhan/add-serial-no
...
[Fix] Add Serial No fix for other langauges
2017-02-27 13:14:57 +05:30
Kanchan Chauhan
6981870a40
[Fix] Add Serial No fix for other langauges
2017-02-27 12:54:13 +05:30
robert schouten
4766562ff0
fix typo on get product bundle
2017-02-27 13:30:18 +08:00
Ben Cornwell-Mott
08c1e86b1c
Moved link button. Creates new row for unlinked quantities
2017-02-25 23:16:54 -08:00
Nabin Hait
72c7e73ce0
Merge pull request #7852 from rohitwaghchaure/production_order_issue
...
[Fix] Production order operations scheduling issue
2017-02-25 11:03:43 +05:30
superlack
c95ebdb4e4
Update sales_order.py
2017-02-24 12:35:10 -08:00
superlack
f800892ec3
Update project.py
2017-02-24 12:33:59 -08:00
Rohit Waghchaure
94c30d81b1
[Fix] Production order operations scheduling issue
2017-02-24 19:21:40 +05:30
Nabin Hait
697150f339
Leave application overlap validation for half day and test cases
2017-02-24 18:53:34 +05:30
Manas Solanki
d77fac113f
Make All Assessment Group parent in assessment group tree
2017-02-24 15:30:22 +05:30
Nabin Hait
da73e1b806
Merge pull request #7851 from rohitwaghchaure/account_paid_to_payment_entry
...
[Fix] Payment entry account Paid To Show receivable accounts for supplier
2017-02-24 15:18:50 +05:30
Kanchan Chauhan
26b79f108a
Leave Application Enchancement
2017-02-24 15:13:06 +05:30
Rohit Waghchaure
b983f26b98
[Fix] Payment entry account Paid To Show receivable accounts for supplier
2017-02-24 15:07:54 +05:30
Neil Trini Lasrado
c15b5db030
Added 'All Assessment Group' to fixtures
2017-02-24 13:16:46 +05:30
Neil Trini Lasrado
e4903b77b6
Added New Doctype - Assessment Code
2017-02-24 13:16:46 +05:30
Neil Trini Lasrado
15944b9ecf
Added Academic Term to Assessment Group
2017-02-24 13:16:46 +05:30
Nabin Hait
2bcacec5c6
Merge pull request #7576 from RobertSchouten/compact_dev
...
[fix] compact print format not longer ignores format builder
2017-02-24 13:09:18 +05:30
Nabin Hait
ff5bd680c2
Merge pull request #7840 from rmehta/new-buttons
...
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-24 12:57:13 +05:30
Nabin Hait
d9afd7e4aa
Merge pull request #7822 from rmehta/desktop-messages
...
[enhance] desktop messages
2017-02-24 12:55:34 +05:30
Nabin Hait
9f0d64b679
Merge pull request #7841 from mbauskar/hotfix
...
[minor] fixed assessment module icon
2017-02-24 12:50:16 +05:30
Manas Solanki
230df2c9d3
Link the sibling child table with the student doctype
2017-02-24 12:09:55 +05:30
Manas Solanki
53259fb91f
Change in student master should reflect in every linked doctype and child doctype
2017-02-24 11:25:04 +05:30
superlack
868ef7738f
Update project.json
2017-02-23 17:46:07 -08:00
superlack
23e5d40374
Update sales_order.py
2017-02-23 17:43:50 -08:00
superlack
c4587d2945
Update project.py
2017-02-23 17:39:05 -08:00
mbauskar
cea7d32b31
[minor] fixed assessment module icon
2017-02-23 20:28:47 +05:30
Rushabh Mehta
509543752c
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-23 17:03:46 +05:30
Nabin Hait
5278da8901
Merge pull request #7830 from mbauskar/develop
...
[minor] eval conditions for recurring sections and lead fields
2017-02-23 16:54:20 +05:30
Nabin Hait
8ec1b565f5
Merge pull request #7823 from KanchanChauhan/payroll-currency
...
[Minor] Company default currency in Salary Slip and Structure
2017-02-23 16:52:23 +05:30
Nabin Hait
89f7767b51
Merge pull request #7818 from KanchanChauhan/product-bundle-fix
...
[Fix] Disappearing Dropdown fixed
2017-02-23 16:49:49 +05:30
Kanchan Chauhan
52a5cb9ae3
[Fix] Holiday Calendar Fix
2017-02-23 16:15:12 +05:30
Nabin Hait
60db08fd7f
Merge pull request #7817 from KanchanChauhan/loan-management-fix
...
[Minor] Field label rename
2017-02-23 16:09:11 +05:30
Kanchan Chauhan
951e31667b
[Minor] Company default currency in Salary Slip and Structure
2017-02-23 11:16:53 +05:30
Nabin Hait
97b3be6f9d
Update salary_structure_employee.json
2017-02-23 11:10:05 +05:30
KanchanChauhan
90b42c4fa2
Merge pull request #7826 from KanchanChauhan/landed-cost-voucher-test
...
[Minor] Landed Cost Voucher test case fixed
2017-02-23 09:58:40 +05:30
Kanchan Chauhan
1d45a4312e
[Minor] Landed Cost Voucher test case fixed
2017-02-23 08:44:02 +05:30
mbauskar
ddb9f0bf78
[minor] lead hide/unhide campain_name, customer field depending on source
2017-02-22 18:54:47 +05:30
mbauskar
d6e409ea92
[minor] hide recurring section if document is in __local state
2017-02-22 18:22:14 +05:30
Kanchan Chauhan
fe61c314b7
[Minor] Landed Cost Voucher test case fixed
2017-02-22 17:25:26 +05:30
nick9822
089c5caea5
Sales analytics error after upgrade
...
Hi Team,
We were getting errors in sales analytics report after the upgrade.
https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6
With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item.
Please see whether its good or there is better solution for it.
Thanks,
Nick
2017-02-22 17:09:29 +05:30
Manas Solanki
7a61f12572
Fixes for attendance reports
2017-02-22 16:19:57 +05:30
Rushabh Mehta
05ce7ec7bb
[enhance] desktop messages
2017-02-22 16:15:43 +05:30
Kanchan Chauhan
b249a6e6f7
[Fix] Disappearing Dropdown fixed
2017-02-22 15:39:07 +05:30
Nabin Hait
5079c9ef47
Fixed merge conflict
2017-02-22 15:31:31 +05:30
Nabin Hait
633698affc
bumped to version 7.2.23
2017-02-22 15:35:27 +06:00
Kanchan Chauhan
6af7140763
[Minor] Field label rename
2017-02-22 14:58:34 +05:30
mbauskar
a8fa10d2a9
[minor] minor fixes for journal entry get_exchange_rate trigger
2017-02-22 14:51:09 +05:30
Nabin Hait
08847bd06a
minor fix
2017-02-22 13:05:46 +05:30
Nabin Hait
1e3a0b4632
Merge branch 'shishu' of https://github.com/manassolanki/erpnext into manassolanki-shishu
2017-02-22 12:12:58 +05:30
Nabin Hait
753c8dedde
Update api.py
2017-02-22 11:53:13 +05:30
Nabin Hait
2d8047837c
Merge pull request #7802 from KanchanChauhan/multiple-items-purchase
...
[Fix] Throw error if item is added multiple time
2017-02-22 11:43:17 +05:30
Nabin Hait
1bdb6a57f2
Merge pull request #7809 from rohitwaghchaure/financial_statement_company_issue
...
[Fix] Company fiscal year issue in financial statement
2017-02-22 11:41:16 +05:30
Kanchan Chauhan
f2803ac427
[Fix] Throw error if item is added multiple time
2017-02-22 10:40:38 +05:30
Manas Solanki
47aba953e2
Added student language doctype
2017-02-21 18:49:00 +05:30
Manas Solanki
f869a679ae
Fixed Student Attendence
2017-02-21 18:49:00 +05:30
Nabin Hait
0142fdc0d7
Update rename_att_date_attendance.py
2017-02-21 16:01:21 +05:30
Rohit Waghchaure
49523d7f80
[Fix] Company fiscal year issue in financial statement
2017-02-21 14:20:26 +05:30
Kanchan Chauhan
42f55cf4b1
[Patch] Attendance Date rename field
2017-02-21 13:44:01 +05:30
Nabin Hait
6e1a2b16a5
Company, Currency, Conversion Rate fields are mandatory in BOM
2017-02-21 13:11:02 +05:30
Nabin Hait
d5442b5544
Merge pull request #7791 from nabinhait/pro_order_stock_qty
...
Build Qty considering quantity for which bom is created
2017-02-21 09:58:13 +05:30
Nabin Hait
7056ce54d7
Update salary_structure.py
2017-02-20 23:28:47 +05:30
Nabin Hait
391eca18c7
Fixed merge conflict
2017-02-20 19:38:22 +05:30
Nabin Hait
6fd8cca135
Merge pull request #7587 from noussh/develop
...
updated missing navigation links in Docs - Accounts
2017-02-20 19:33:55 +05:30
Nabin Hait
6a85752ead
Merge branch 'hotfix' into remove-joining-datep-validation
2017-02-20 19:31:38 +05:30
Nabin Hait
e17519accb
Update salary_structure.py
2017-02-20 19:30:44 +05:30
Nabin Hait
0d66579e83
Merge branch 'develop' into develop
2017-02-20 19:22:03 +05:30
Nabin Hait
aa968cd12e
Merge pull request #7751 from nick9822/patch-3
...
Next Depreciation Date is entered as past date
2017-02-20 19:11:31 +05:30
Nabin Hait
cd837ecbac
Merge branch 'develop' into develop
2017-02-20 19:09:20 +05:30
Nabin Hait
8bb69ff8bf
Fixed merge conflict
2017-02-20 19:01:04 +05:30
Nabin Hait
e49d901907
Update process_payroll.py
2017-02-20 18:36:12 +05:30
Nabin Hait
afd8df8a20
Build Qty considering quantity for which bom is created
2017-02-20 18:06:50 +05:30
Nabin Hait
6ffd77660b
Changed module for Production Analytics
2017-02-20 17:41:44 +05:30
Nabin Hait
3cdb65f782
Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana
2017-02-20 17:25:01 +05:30
Nabin Hait
589f4656ad
Merge branch 'develop' into in_global_search
2017-02-20 15:04:52 +05:30
Nabin Hait
9f4cb0c097
Fixed merge conflict
2017-02-20 15:00:04 +05:30
Nabin Hait
66b373033a
bumped to version 7.2.22
2017-02-20 15:22:01 +06:00
Nabin Hait
e6a5d5dc64
Merge pull request #7784 from mbauskar/minor-fixes
...
[minor] minor fixes for contact us page
2017-02-20 14:43:24 +05:30
Nabin Hait
da098222d7
Merge pull request #7780 from rohitwaghchaure/minor_fix_payment_entry
...
[Fix] Removed employee party type from the payment entry
2017-02-20 14:43:14 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
Makarand Bauskar
98f9427ba1
[minor] minor fixes for contact us page
2017-02-20 12:41:48 +05:30
bcornwellmott
97ab1d2eb3
Merge pull request #7691 from bcornwellmott/stock_reports
...
Stock reports
2017-02-19 14:36:35 -08:00
bcornwellmott
568dac3aad
Fixed Link Option for Warehouse
2017-02-19 14:04:20 -08:00
Rohit Waghchaure
f73d459c80
[Fix] Removed employee party type from the payment entry
2017-02-19 17:46:05 +05:30
Nabin Hait
02d987ed13
Minor fix for common tree view
2017-02-17 15:50:53 +05:30
Nabin Hait
64e222697c
Merge pull request #7769 from nabinhait/setup_fy_dates
...
Set fiscal year start and end date based on country
2017-02-17 15:18:28 +05:30
Nabin Hait
e285258374
Merge pull request #7762 from mbauskar/hotfix
...
[minor] timestamp fixes for heatmap
2017-02-17 15:18:01 +05:30
Rushabh Mehta
0c5375d0fa
[minor] item name not mandatory and item price with quick edit
2017-02-17 14:57:31 +05:30
mbauskar
90818080b1
[minor] Configured Auto Close days for Opportunity and Issue
2017-02-17 14:56:00 +05:30
mbauskar
e1e25a0c9d
[minor] auto close opportunity after 7 days
2017-02-17 14:54:50 +05:30
Rohit Waghchaure
a020e4eba4
Payment entry fields issue, added total billed hours in timesheet
2017-02-17 14:51:57 +05:30
Nabin Hait
6af7dd4e1b
Set fiscal year start and end date based on country
2017-02-17 14:47:33 +05:30
Nabin Hait
801fa80b39
Merge pull request #7764 from rohitwaghchaure/clean_supplied_items
...
[Fix] Cleanup supplied items if supply raw material is set as No
2017-02-17 12:36:05 +05:30
Nabin Hait
9e5b3dad29
Minor fix in assesment
2017-02-17 11:03:44 +05:30
Rohit Waghchaure
4b9d2f2733
[Fix] Cleanup supplied items if supply raw material is set as No
2017-02-16 18:53:23 +05:30
Kanchan Chauhan
1b204c8e4e
Accrual Payroll System
2017-02-16 16:30:51 +05:30
nick9822
23e174c270
Validation for purchase_date
...
Separate validation for purchase date.
2017-02-16 16:26:38 +05:30
mbauskar
e7b87ad071
[minor] timestamp fixes for heatmap
2017-02-16 16:05:46 +05:30
Nabin Hait
de45b0eddc
Merge branch 'master' into develop
2017-02-16 15:59:59 +05:30
Nabin Hait
a7d6b68bc0
bumped to version 7.2.21
2017-02-16 16:29:58 +06:00
Nabin Hait
d13d198dc8
Merge pull request #7747 from KanchanChauhan/item-name-asset
...
[Minor] Item Name in Asset
2017-02-16 15:15:23 +05:30
Rushabh Mehta
6dd461fec4
[add] site activation level
2017-02-16 14:53:21 +05:30
Nabin Hait
92c52f4623
Merge pull request #7732 from neilLasrado/student-left
...
Added ability to send newsletter to Student batch Guardians and Student Group Guardians
2017-02-16 14:40:14 +05:30
Nabin Hait
ea1cb68fe7
Merge branch 'master' into develop
2017-02-16 14:37:50 +05:30
Nabin Hait
7677b56f7c
bumped to version 7.2.20
2017-02-16 15:07:48 +06:00
Nabin Hait
b280398626
Merge pull request #7739 from rohitwaghchaure/payment_entry_currency_symbol_issue
...
[Fix] Payment Entry currency symbol issue
2017-02-16 14:21:24 +05:30
Nabin Hait
99c6c79834
Update payment_entry.js
2017-02-16 14:21:04 +05:30
Nabin Hait
507e6fa46e
Merge pull request #7749 from KanchanChauhan/leave-application-cleanup
...
Rejected leave application can be submitted
2017-02-16 14:19:11 +05:30
Neil Trini Lasrado
fa2023d3da
Added ability to send newsletter to Student batch Guardians and Student Group Guardians
2017-02-16 13:33:09 +05:30
Nabin Hait
3437a9a123
minor fix
2017-02-16 12:14:30 +05:30
pratu16x7
86415f394d
[minor] duration bar
2017-02-16 09:27:53 +05:30
mlisb0n
835a615af8
Add files via upload
2017-02-15 15:45:52 +01:00
Kanchan Chauhan
11f159193e
Rejected leave application can be submitted
2017-02-15 19:09:21 +05:30
Nabin Hait
2f7697d1bd
Merge pull request #7746 from pratu16x7/minor-search-presets
...
Preset doctypes fields to Search
2017-02-15 18:46:03 +05:30
Nabin Hait
d9068497cb
Merge pull request #7736 from KanchanChauhan/serial-no-status-report
...
[Fix] Serial No Status
2017-02-15 17:56:50 +05:30
Nabin Hait
b8624efe3a
Merge pull request #7750 from KanchanChauhan/territory-filter-opportunity
...
[Minor] Is group filter removed from Territory in Opportunity
2017-02-15 17:41:31 +05:30
Nabin Hait
afef62c887
Merge pull request #7737 from KanchanChauhan/project-percentage
...
[Fix] Project % Completed set to 0 if no tasks
2017-02-15 17:28:53 +05:30
Nabin Hait
e827104a52
Merge pull request #7738 from KanchanChauhan/appraisal-fix
...
[Fix] Empty row in Goals of Appraisal fixed
2017-02-15 17:26:40 +05:30
nick9822
e5cb3e34fe
nowdate changed to purchase_date
...
next depreciation date should be compared with purchase_date instead of nowdate.
2017-02-15 15:32:50 +05:30
Kanchan Chauhan
7118b5a2bd
[Minor] Is group filter removed from Territory in Opportunity
2017-02-15 14:46:08 +05:30
Kanchan Chauhan
2307f57f19
[Minor] Item Name in Asset
2017-02-15 11:52:29 +05:30
Rohit Waghchaure
ff41c82c2b
[Fix] Payment Entry currency symbol issue
2017-02-15 11:44:15 +05:30
pratu16x7
349ed568ed
Add task and item
2017-02-15 09:23:26 +05:30
pratu16x7
ca56ad0bfc
[minor] fix test
2017-02-14 18:49:26 +05:30
pratu16x7
462e89e452
[minor] margin fix
2017-02-14 17:18:10 +05:30
pratu16x7
0e94b4bec4
Mobile view fixes
2017-02-14 17:18:09 +05:30
pratu16x7
60fe77cc90
Website data from existing child tables, layout, images
2017-02-14 17:18:09 +05:30
pratu16x7
dee36e10ae
Add operations and items to website
2017-02-14 17:18:09 +05:30
pratu16x7
aad8257e20
Add template
2017-02-14 17:18:09 +05:30
Kanchan Chauhan
ecdcac1fdf
[Fix] Empty row in Goals of Appraisal fixed
2017-02-14 15:32:06 +05:30
KanchanChauhan
993358d5d7
Update install.md
2017-02-14 15:12:07 +05:30
Kanchan Chauhan
bab6c9c006
[Fix] Project perecentage set 0 if no tasks
2017-02-14 14:30:00 +05:30
Kanchan Chauhan
79cd59303a
[Fix] Serial No Status
2017-02-14 12:49:36 +05:30
mbauskar
2ecfd9be5d
[minor] fetched tickets to closed using sql instead of get_all
2017-02-14 08:41:09 +05:30
Nabin Hait
99dfa3060a
Check existing SO, PO and MR for disabling 'Is Stock Item' checkbox
2017-02-13 16:06:02 +05:30
Kanchan Chauhan
779c581a92
[Minor] List of Contacts
2017-02-13 16:01:52 +05:30
Nabin Hait
89b6c47b2e
Merge pull request #7712 from rohitwaghchaure/minor_fix_item_valuation_method
...
[Fix] Valuation method changing issue in the item
2017-02-13 15:42:22 +05:30
Neil Trini Lasrado
1ab8554d15
Removed Nationality in Student Applicant as a link feild to Country
2017-02-12 01:29:24 +05:30
Neil Trini Lasrado
c1bf70dc75
Added Exit Section to Student master
2017-02-12 01:17:52 +05:30
suyashphadtare
34ab136b46
[fix] Remove un-necessary Whitespace
2017-02-10 19:14:43 +05:30
suyashphadtare
750a067688
[minor][fix] Show all warehouses with item actual qty in warehouse set query
2017-02-10 19:14:43 +05:30
suyashphadtare
049a88cc40
[minor] Show item quantity in warehouse set query
2017-02-10 19:14:43 +05:30
Kanchan Chauhan
1cd5e583ba
[Fix] Apply Now button redirect fixed for Job Opening
2017-02-10 17:58:41 +05:30
KanchanChauhan
cc2c7649a8
[Minor] Stock Entry Fix ( #7715 )
2017-02-10 17:47:49 +05:30
Nabin Hait
bdd470a6d1
Update item.py
2017-02-10 17:12:48 +05:30
Rohit Waghchaure
2f09dc0e62
[Fix] Valuation method changing issue in the item
2017-02-10 15:29:45 +05:30
Nabin Hait
29dfb9479b
Merge pull request #7710 from joolsr/patch-1
...
Update customer.md
2017-02-10 13:23:06 +05:30
Ben Cornwell-Mott
67a13972fb
Added warehouse to BOM Stock Report, fixed bugs with buildable qty
2017-02-09 23:21:52 -08:00
Nabin Hait
5a69f24dfe
Merge pull request #7705 from rmehta/stock-entry-fix
...
[minor] added make material request from Stock Entry and removed cur_frm
2017-02-10 12:51:09 +05:30
Nabin Hait
b41b10976f
Merge pull request #7644 from mbauskar/develop
...
[docs] Feedback triggers
2017-02-10 12:13:31 +05:30
mbauskar
edaa43d9b8
[docs] manual feedback request and minor fixes
2017-02-10 11:28:45 +05:30
bcornwellmott
630882787a
Added buildable qty
...
The field indicates how many can be built.
2017-02-09 20:41:12 -08:00
bcornwellmott
fc41bb6afd
Fixed code issues
...
Also changed qty to Quantity left to build
2017-02-09 20:37:11 -08:00
joolsr
f9fdbe2853
Update customer.md
2017-02-09 23:10:39 +00:00
Rushabh Mehta
cf99dc0e77
[fix] for setup wizard tests and demo;
2017-02-09 18:06:11 +05:30
Rushabh Mehta
e6aa3b435a
[minor] added make material request from Stock Entry and removed cur_frm
2017-02-09 17:47:22 +05:30
mbauskar
d487bf77e1
[minor] payment entry company trigger
2017-02-09 12:57:25 +05:30
Nabin Hait
2b5fa7647a
Merge pull request #7662 from nick9822/patch-2
...
Sales analytics error after upgrade
2017-02-09 11:45:30 +05:30
Nabin Hait
e27a0d25bc
Merge pull request #7654 from rohitwaghchaure/lead_tax_issue
...
[Fix] Set default tax on quotation when it's making from the lead
2017-02-09 11:43:22 +05:30
khatrijitendra
d262eb1a1c
issue in type and rate
...
1. there is not such field, "type" it is "margin_type"
2. there is not such field, "rate" it is "margin_rate_or_amount"
2017-02-08 14:59:59 +05:30
Nabin Hait
6ff0caa87a
Fixed merge conflict
2017-02-08 11:33:33 +05:30
Nabin Hait
57e97c06e6
bumped to version 7.2.19
2017-02-08 12:02:47 +06:00
Nabin Hait
6f93cd5bd0
Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2
...
Minor fixes
2017-02-08 11:21:54 +05:30
Nabin Hait
533d22e88b
Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center
...
[Fix] Allow data import tool for cost center
2017-02-08 11:21:25 +05:30
Rohit Waghchaure
b3489548a9
minor fix
2017-02-08 11:20:04 +05:30
Ben Cornwell-Mott
05dca985e6
Fixed stock query and corrected with suggestions from rohit
2017-02-07 09:15:33 -08:00
mbauskar
1df0b9bfed
[minor] minor fixes in feedback index.md
2017-02-07 15:20:08 +05:30
mbauskar
298acd3d1a
[docs] Feedback triggers
2017-02-07 15:20:08 +05:30
Nabin Hait
70fd8546ce
Merge pull request #7677 from KanchanChauhan/serial-no-in-return
...
[Fix] Serial No if is_return
2017-02-07 13:28:30 +05:30
Nabin Hait
555279b6e6
Merge pull request #7680 from bcornwellmott/patch-7
...
Duplicate "title" field
2017-02-07 13:27:46 +05:30
Nabin Hait
ddcb514b65
Merge pull request #7685 from KanchanChauhan/employee-details-in-salary-preview
...
[Fix] Employee Details in Salary Slip preview
2017-02-07 13:27:24 +05:30
Nabin Hait
0a6aaf4257
Get standard/historical valuation rate where missing: some minor fixes
2017-02-07 12:50:22 +05:30
mbauskar
9c0bf73d25
[minor] auto close issue using ORM (document save method)
2017-02-07 12:50:05 +05:30
Kanchan Chauhan
842ad55235
[Fix] Employee Details in Salary Slip preview
2017-02-07 12:07:55 +05:30
Kanchan Chauhan
4f3b0aa249
[Fix]Serial No if is_return
2017-02-07 11:28:34 +05:30
Ben Cornwell-Mott
02c02bc572
Fixed counting to correctly reflect all status at each month
2017-02-06 20:58:25 -08:00
Nabin Hait
ea8fab52c6
Get standard/historical valuation rate where missing, if item is not a sample item
2017-02-07 01:24:32 +05:30
bcornwellmott
92b6ceec41
Duplicate "title" field
...
The title field was duplicated - removed first one.
2017-02-06 10:51:02 -08:00
Neil Trini Lasrado
2160638f36
Merge pull request #7679 from neilLasrado/stud-group
...
Added validation to check if Student in a student group exists in the…
2017-02-07 00:17:24 +05:30
Neil Trini Lasrado
c28598ae8b
Merge pull request #7678 from neilLasrado/stud-att
...
Added validations to Student Attendance
2017-02-07 00:17:14 +05:30
Neil Trini Lasrado
3ade874f9e
Added validations to Student Attendance
2017-02-06 20:07:02 +05:30
Neil Trini Lasrado
05dec9a880
Added validation to check if Studnet in a student group exists in the student batch specified
2017-02-06 20:05:16 +05:30
mbauskar
c874a82559
[minor] index out of range fixes for JE
2017-02-06 15:41:34 +05:30
Kanchan Chauhan
5f5457085e
Joining date validation removed from Salary Structure
2017-02-06 14:50:39 +05:30
Rushabh Mehta
50862039dc
[minor] fixes to schools
2017-02-06 14:28:52 +05:30
Rohit Waghchaure
ade06f940c
[Fix] Set default tax on quotation when it's making from the lead
2017-02-06 12:14:09 +05:30
Nabin Hait
259489572d
Merge pull request #7657 from rmehta/po-from-so
...
[enhance] production order from sales order
2017-02-06 11:41:56 +05:30
Nabin Hait
101aaed643
Merge pull request #7614 from KanchanChauhan/account-filters-payroll
...
[Fix] Account filter in Process Payroll and Salary Component
2017-02-06 11:36:48 +05:30
Nabin Hait
20d2d7548a
Update salary_component.js
2017-02-06 11:36:38 +05:30
Ben Cornwell-Mott
28945438f2
Created button to link buying items to material requests
2017-02-05 18:55:57 -08:00
Ben Cornwell-Mott
36d04fda37
Fixed filter dates and date comparisons
2017-02-05 14:00:46 -08:00
Ben Cornwell-Mott
b4a2c2f047
Got proper cumulative data working
2017-02-05 13:39:39 -08:00
Ben Cornwell-Mott
943124275d
Production Analytics
2017-02-04 14:25:53 -08:00
rohitwaghchaure
ac65e956e8
Merge pull request #7659 from saurabh6790/demo_user_perm_fix
...
[minor][fix] demo user perm fix
2017-02-03 16:51:33 +05:30
Rushabh Mehta
e92a740b53
[minor] school patch fix
2017-02-03 16:05:53 +05:30
nick9822
acb5e9a11b
Sales analytics error after upgrade
...
Hi Team,
We were getting errors in sales analytics report after the upgrade.
https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6
With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item.
Please see whether its good or there is better solution for it.
Thanks,
Nick
2017-02-03 12:31:54 +05:30
Saurabh
9ca3f2847a
a[minor][fix] demo user perm fix
2017-02-02 19:22:36 +05:30
Rushabh Mehta
6ede4a3809
[enhance] production order from sales order
2017-02-02 17:42:01 +05:30
Neil Trini Lasrado
f37d329cf5
Merge branch 'develop' into eval-group
2017-02-02 17:30:10 +05:30
rohitwaghchaure
3f10c7f4fc
Merge pull request #7609 from rmehta/remove-party-status
...
Remove Party Status
2017-02-02 16:10:26 +05:30
KanchanChauhan
6575a0a7e2
[Minor]ROI fix in Employee Loan ( #7643 )
2017-02-02 16:01:43 +05:30
Rushabh Mehta
a3d0bea375
Merge branch 'develop' into remove-party-status
2017-02-02 15:42:04 +05:30
Kanchan Chauhan
3e2ecc3423
[Fix] Account filter in Process Payroll and Salary Component
2017-02-02 14:41:48 +05:30
Nabin Hait
6b9902627d
Merge pull request #7638 from rohitwaghchaure/gross_profit_report_issue
...
[Fix] Buying rate in gross profit report
2017-02-02 13:41:32 +05:30
Nabin Hait
c62362f064
Merge pull request #7649 from KanchanChauhan/salary-struct-fix
...
[Fix] Employee name fixes in Salary Structure
2017-02-02 13:30:05 +05:30
Kanchan Chauhan
a0314f19ca
[Fix] Employee name fixes in Salary Structure
2017-02-02 12:56:56 +05:30
Neil Trini Lasrado
4aabe61197
Patch for renaming evaluation criteria
2017-02-01 19:32:28 +05:30
Rohit Waghchaure
69060a8177
Minor fix
2017-02-01 19:14:53 +05:30
Neil Trini Lasrado
749516c22d
Renamed Evaluation Criteria to Assessment Criteria
2017-02-01 18:47:36 +05:30
Rushabh Mehta
3714626dd0
[minor] enhance BOM view
2017-02-01 18:35:53 +05:30
KanchanChauhan
b499fe91fa
Revert "[Fix] Rate of Interest Fix"
2017-02-01 18:16:35 +05:30
rohitwaghchaure
c13dbd408f
[Enhancement] POS Redesign ( #7639 )
...
* item group, discount
* POS Redesign
* offline customer
* removed offline records from modal view
2017-02-01 18:07:22 +05:30
KanchanChauhan
929c3890a4
Merge pull request #7641 from KanchanChauhan/employee-loan-fix
...
[Fix] Rate of Interest Fix
2017-02-01 18:06:32 +05:30
KanchanChauhan
0e995adc44
Salary Structure Employee custom field can be used in Formula and Condition ( #7615 )
2017-02-01 18:05:57 +05:30
Kanchan Chauhan
f01c1c2a9d
[Fix] Rate of Interest Fix
2017-02-01 18:05:26 +05:30
KanchanChauhan
3dc96cf71e
Merge pull request #7640 from KanchanChauhan/remove-date-validation-salary-structure
...
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:42:18 +05:30
Kanchan Chauhan
e67e2e6fee
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:41:36 +05:30
Rohit Waghchaure
38f808cfae
[Fix] Buying rate in gross profit report
2017-02-01 13:34:06 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
Rushabh Mehta
587dd90182
[minor] removed customer status
2017-02-01 12:01:24 +05:30
Rushabh Mehta
99ce531beb
[minor] css for team updates
2017-02-01 11:46:47 +05:30
Neil Trini Lasrado
d408553b93
Merge pull request #7623 from neilLasrado/guardian
...
Added Student table in Guardian (Only rendered for display purpose)
2017-01-31 18:18:50 +05:30
Neil Trini Lasrado
ebfb7ff027
Merge pull request #7625 from neilLasrado/student-batch
...
Added Mark Assessment Result Button in assessment plan
2017-01-31 18:18:32 +05:30
Neil Trini Lasrado
879a2d84dc
Added Evaluation Criteria Group
2017-01-31 17:03:37 +05:30
Neil Trini Lasrado
477c88450f
UI fixes for Guardian Doctype
2017-01-31 16:49:39 +05:30
Neil Trini Lasrado
9071bcbfa8
Added Student table in Guardian (Only rendered for display purpose)
2017-01-31 16:36:29 +05:30
Rushabh Mehta
7ec4b717ed
[feature] added team updates page
2017-01-31 11:42:58 +05:30
Rohit Waghchaure
d9a265fab1
Merge branch 'develop' of github.com:frappe/erpnext into develop
2017-01-31 11:34:07 +05:30
Neil Trini Lasrado
1947aca2a8
Added Mark Assessment Result Button in assessment plan
2017-01-30 18:34:25 +05:30
Neil Trini Lasrado
ba96ce7dd5
Merge pull request #7616 from neilLasrado/assessment-validations
...
Patch fix for Update Assessment Module Patch
2017-01-30 17:50:37 +05:30
Neil Trini Lasrado
fd1767d2ea
Patch fix for Update Assessment Module Patch
2017-01-30 17:50:05 +05:30
Rushabh Mehta
4500f7b4d6
[cleanup] remove unused LMS ( #7612 )
2017-01-30 17:04:38 +05:30
Neil Trini Lasrado
ab1ee1e6fc
Patch fix for Update Assessment Module Patch
2017-01-30 16:40:14 +05:30
Neil Trini Lasrado
80ca65c166
Added validation to ensure that the Sum of Scores of evaluation Criteras is equal to the max assessment score.
2017-01-30 15:28:41 +05:30
KanchanChauhan
fbaa6197f9
Employee Loan Management ( #7126 )
...
* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR
2017-01-30 15:15:58 +05:30
Rushabh Mehta
364f48aad2
[minor] fix patch
2017-01-30 13:23:09 +05:30
Rushabh Mehta
87037bdd56
[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568
2017-01-30 13:22:51 +05:30
Makarand Bauskar
d893efd0a9
[minor] replace object values in translations ( #7602 )
2017-01-30 12:35:34 +05:30
rohitwaghchaure
3b40098738
Merge pull request #7571 from RicardoJohann/projectfilter
...
added project filter to gl and carry project filter from P&L
2017-01-30 12:24:36 +05:30
Rohit Waghchaure
b327429db7
[Fix] Allow data import tool for cost center
2017-01-30 11:34:29 +05:30
mbauskar
16ce3623bc
[fixes] set lead to Null on delete company transaction & other minor fixes
2017-01-30 10:45:28 +05:30
mbauskar
51b1d6de48
[minor] moved the address_and_contact utils to frappe
2017-01-30 10:45:28 +05:30
mbauskar
7fa039f15c
[fixes] delete company transaction and other minor fixes
2017-01-30 10:45:28 +05:30
mbauskar
83f4780f74
[Fixes] Address and Contact fixes
2017-01-30 10:45:28 +05:30
mbauskar
8271b4c564
[minor] fixes in address filters
2017-01-30 10:45:28 +05:30
mbauskar
cbc49e2989
[WIP] Address and Contact Fixes
2017-01-30 10:45:28 +05:30
rohitwaghchaure
531b49f6c7
Merge pull request #7590 from KanchanChauhan/rename-task
...
[Minor]Task rename now possible
2017-01-30 09:29:10 +05:30
KanchanChauhan
2dfb90a922
Merge pull request #7565 from KanchanChauhan/leave-balance-report-fix
...
[Fix] Permissions to view Leave Balance Report
2017-01-29 21:07:02 +05:30
Rohit Waghchaure
92c9ad8c72
Merge branch 'master' into develop
2017-01-28 14:14:33 +05:30
Rohit Waghchaure
ce4a0b20ab
bumped to version 7.2.18
2017-01-28 14:44:32 +06:00
Kanchan Chauhan
b77eaf7053
[URGENT][FIX]Stock Controller fix
2017-01-28 13:26:46 +05:30
Neil Trini Lasrado
6d0da98a78
Fixes to update student guardian name patch
2017-01-27 17:44:28 +05:30
Neil Trini Lasrado
7ff5682193
Merge branch 'develop' into guarding-name
2017-01-27 16:54:50 +05:30
Neil Trini Lasrado
f36ff488c0
Added Guardian Name to Student Master
2017-01-27 16:53:55 +05:30
Rushabh Mehta
e239d4dfe9
Merge branch 'master' into develop
2017-01-27 16:18:26 +05:30
Rushabh Mehta
098bd34f00
bumped to version 7.2.17
2017-01-27 16:48:25 +06:00
Rushabh Mehta
063e86a1bf
[fix] remove on_update in Item
2017-01-27 16:16:08 +05:30
Rushabh Mehta
b5eaf324b3
Merge branch 'master' into develop
2017-01-27 16:03:30 +05:30
Rushabh Mehta
5f0027a2d0
bumped to version 7.2.16
2017-01-27 16:33:29 +06:00
Rushabh Mehta
fd82f4b0d4
[minor] fix for item_group.py
2017-01-27 16:00:47 +05:30
Rushabh Mehta
710dc5392f
[merge]
2017-01-27 15:48:31 +05:30
Rushabh Mehta
149c033c8f
bumped to version 7.2.15
2017-01-27 16:16:07 +06:00
Neil Trini Lasrado
7326217ab5
Added 'Active' checkbox in list view for Student Batch and Student Group
2017-01-27 14:50:48 +05:30
Neil Trini Lasrado
8c3fb43d8a
Fix- Student batch strength in Batch Wise attendance report
2017-01-27 14:13:25 +05:30
Kanchan Chauhan
3dd85a0e9e
Task rename now possible
2017-01-27 12:34:06 +05:30
Kanchan Chauhan
e877ecfb7b
[Fix] Permissions to view Leave Balance Report
2017-01-27 11:53:56 +05:30
noussh
425d7adcdd
Update recurring-orders-and-invoices.md
2017-01-26 15:38:57 +04:00
noussh
0350db6a4e
added next link
2017-01-26 15:35:01 +04:00
noussh
1e86546e2c
added the link
2017-01-26 12:53:45 +04:00
noussh
6396c90956
Update multi-currency-accounting.md
2017-01-26 12:52:29 +04:00
noussh
47fbc7efa5
adde the next page link
2017-01-26 12:50:34 +04:00
noussh
8b62626cec
Wrong path updated
2017-01-25 19:44:32 +04:00
Nabin Hait
355b4110c9
Merge pull request #7583 from rohitwaghchaure/valuation_rate_issue
...
[Fix] Get valuation rate from item master and update stock value difference
2017-01-25 19:21:04 +05:30
Nabin Hait
cb19f52985
Update stock_controller.py
2017-01-25 19:20:35 +05:30
Rohit Waghchaure
3899d74f15
[Fix] Get valuation rate from item master and update stock value difference
2017-01-25 18:47:53 +05:30
Nabin Hait
57e4ab70be
Merge pull request #7580 from KanchanChauhan/calendar-manual-screenshots
...
New screenshots for Calendar user manual
2017-01-25 17:35:01 +05:30
Nabin Hait
d288909310
Merge pull request #7561 from KanchanChauhan/salary-slip-fix-abbr
...
Patch to update Salary Detail where Salary Component Abbr is null
2017-01-25 17:23:43 +05:30
Kanchan Chauhan
ce116417e1
New screenshots for Calendar user manual
2017-01-25 15:38:35 +05:30
robert schouten
67eff49516
[fix] compact print format not longer ignores format builder
2017-01-25 08:20:43 +08:00
Ricardo Johann
34354237fd
added project filter to gl and carry project filter from P&L
2017-01-24 06:46:07 -03:00
vrms
1f1f56225c
Update warehouse.md ( #7544 )
...
added some detail about link between Warehouse & Warehouse account & machanics of sub-warehousese (Warehouse >Room >Row > Shelf >box
2017-01-24 11:29:27 +05:30
KanchanChauhan
4333ce0fd8
Merge pull request #7569 from neilLasrado/assessment
...
Fix for update assessment modules patch
2017-01-24 10:52:50 +05:30
Neil Trini Lasrado
15c5ae0918
Fix for update assessment modules patch
2017-01-24 10:28:49 +05:30
Kanchan Chauhan
679cc23abb
[Fix] Naming series issue fix
2017-01-23 17:20:55 +05:30
Kanchan Chauhan
c948a4fc92
Patch to update Salary Detail where Salary Component Abbr is null
2017-01-23 16:12:45 +05:30
rohitwaghchaure
ab65f6d8b1
Merge pull request #7547 from mnatalia/develop
...
Added translations to the web page and item dashboard.
2017-01-23 15:57:33 +05:30
Neil Trini Lasrado
d471ad2c45
Fix for update assessment modules patch
2017-01-23 14:59:19 +05:30
Makarand Bauskar
01eefafad5
[minor] minor fixes in opportunity form ( #7549 )
2017-01-23 12:15:36 +05:30
Rushabh Mehta
397e508fc0
[fix] sales_partner.js, fixes #7553
2017-01-21 16:58:57 +05:30
Nabin Hait
1f9d1bb877
Merge branch 'develop' into assessment
2017-01-20 20:09:44 +05:30
Neil Trini Lasrado
16d40cf0a3
Added ability to disable a student in student group/studnet batch
2017-01-20 19:33:09 +05:30
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
Nabin Hait
a1d3d84415
bumped to version 7.2.14
2017-01-20 16:10:35 +06:00
Nabin Hait
c1cc7b68c4
Merge pull request #7522 from nabinhait/hotfix
...
Get valuation rate from Item while not found based on SLE
2017-01-20 15:39:24 +05:30
mnatalia
e09407571c
Added translations to the web page and item dashboard.
2017-01-20 12:00:25 +02:00
Nabin Hait
4c952f48f8
Some minor fixes
2017-01-20 15:15:31 +05:30
Nabin Hait
bd1a628c55
Merge pull request #7545 from rohitwaghchaure/minor_issue
...
[Fix] Account user not able to access the report Payment Period Based On Invoice Date
2017-01-20 14:36:48 +05:30
Rohit Waghchaure
93c001455f
[Fix] Account user not able to access the report
2017-01-20 14:18:17 +05:30
Nabin Hait
548cf183ea
Merge pull request #7543 from RobertSchouten/leave_allocation_fix
...
[fix] remove invalid parameter from leave allocation
2017-01-20 12:54:55 +05:30
Nabin Hait
153156e31a
Merge pull request #7529 from rohitwaghchaure/budget_issue
...
[Fix] Budget not working properly
2017-01-20 12:54:29 +05:30
Nabin Hait
a0b967f2cd
Get valuation rate from Item while not found based on SLE
2017-01-20 12:50:40 +05:30
Nabin Hait
f356e539bb
Update set_null_value_to_fields.py
2017-01-20 12:35:22 +05:30
Rohit Waghchaure
84b827efcd
[Fix] Budget not working properly
2017-01-20 12:33:50 +05:30
robert schouten
e14e042f2f
[fix] remove invalid parameter from leave allocation
2017-01-20 15:02:00 +08:00
Nabin Hait
bfcacbf2ca
Merge pull request #7535 from rohitwaghchaure/landed_cost_voucher_issue
...
[Fix] Minor issue in landed cost voucher
2017-01-20 12:12:17 +05:30
Rohit Waghchaure
a3a977d02a
[Fix] Minor issue in landed cost voucher
2017-01-19 18:38:53 +05:30
Kanchan Chauhan
03dc695c77
[Minor] Set website warehouse as default warehouse
2017-01-19 14:57:05 +05:30
Rushabh Mehta
c81621d3ce
[minor] add progress bar in patch
2017-01-19 14:32:36 +05:30
Rushabh Mehta
00d3cd6d64
[fix] contact address link patch
2017-01-19 14:27:02 +05:30
Rushabh Mehta
818af75575
[patch] add patch for contact_address_update
2017-01-19 13:08:46 +05:30
Rushabh Mehta
d69fd1b8c0
[fix] update_salary_slip.py
2017-01-19 12:51:37 +05:30
Rushabh Mehta
683d98fd54
[fix] update_salary_slip.py
2017-01-19 12:48:03 +05:30
Rushabh Mehta
35e4d8b152
[fix] update_salary_slip.py
2017-01-19 12:47:27 +05:30
Rushabh Mehta
60908f4a08
[fix] update_salary_slip.py
2017-01-19 12:46:11 +05:30
Rushabh Mehta
26fdb113a8
[fix] update_salary_slip.py
2017-01-19 12:44:54 +05:30
Kanchan Chauhan
45c14ed41c
[Minor] Date fix in Production Order
2017-01-19 12:22:04 +05:30
Nabin Hait
eb80fdef82
Merge pull request #7520 from RobertSchouten/heatmap_limit_dev
...
[fix] accounts heatmaps now covering 366 days not 20
2017-01-19 09:15:20 +05:30
Nabin Hait
6b3670848e
Merge pull request #7477 from rmehta/custom-perms
...
[minor] fix for custom perms
2017-01-18 17:03:58 +05:30
Rohit Waghchaure
56cc542eb7
[Fix] sales return discount issue
2017-01-18 14:50:24 +05:30
Rushabh Mehta
a0c41b70c4
[fix] tax rule test
2017-01-18 14:14:20 +05:30
Rohit Waghchaure
2b97cee32c
[Fix] POS print issue
2017-01-18 13:21:27 +05:30
robert schouten
c0888637cc
[fix] accounts heatmaps now covering 366 days not 20
2017-01-18 15:25:58 +08:00
Rushabh Mehta
8f55d6bf3a
[fix] test_shopping_cart.py
2017-01-17 22:15:17 +05:30
Rushabh Mehta
d14a6c058a
[fix] stop recursion while adding role
2017-01-17 18:46:37 +05:30
Rushabh Mehta
982be9f11b
[tests] fixed for shopping cart
2017-01-17 17:57:38 +05:30
Rushabh Mehta
7385b73449
[fix] test
2017-01-17 17:57:38 +05:30
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30
Nabin Hait
aff2b9479d
bumped to version 7.2.13
2017-01-17 16:22:25 +06:00
Nabin Hait
f8676b2058
Create Material Requests considering projected qty of items
2017-01-17 14:11:43 +05:30
Ben Cornwell-Mott
5597f6a830
Fixes counting of in stock parent assemblies and formatting of csv
2017-01-17 14:11:43 +05:30
Kanchan Chauhan
653303180a
[Minor] Payroll Fix
2017-01-17 13:54:55 +05:30
Nabin Hait
1c91dc4589
Merge pull request #7475 from RobertSchouten/profitability_order
...
[fix] profiability analasyis orderby name
2017-01-17 12:39:24 +05:30
Nabin Hait
d9e216878f
Merge pull request #7513 from rohitwaghchaure/paid_amount_copy_issue
...
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:38:09 +05:30
Nabin Hait
9e294ee454
Merge branch 'rfq_supplier_pull' into develop
2017-01-17 12:26:09 +05:30
Nabin Hait
2ad62c2892
In RFQ, get items from material requests based on possible supplier
2017-01-17 12:25:33 +05:30
Rohit Waghchaure
f58cad6b13
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:11:57 +05:30
Rushabh Mehta
592104ef68
[fix] tests
2017-01-17 12:06:53 +05:30
Nabin Hait
7c7b3c0ab4
Merge pull request #7465 from KanchanChauhan/attendance-enhancement
...
[Enhancement] Attendance Module
2017-01-17 11:47:02 +05:30
Nabin Hait
0681c77f6a
Merge pull request #7506 from mntechnique/hotfix
...
[Fix] Project: Enabled autocomplete for project users
2017-01-17 11:27:37 +05:30
Nabin Hait
2dab8809e7
Merge pull request #7509 from kickapoo/develop
...
Add Full Name as option in HR Setting Employee creation option
2017-01-17 11:26:25 +05:30
Dhaifallah Alwadani
9eb830ac4f
fix string translation
2017-01-17 11:13:57 +05:30
Nabin Hait
bf01958b85
Merge pull request #7510 from dalwadani/develop
...
fix string translation
2017-01-17 11:12:15 +05:30
Nabin Hait
b064cf39c2
Merge branch 'develop' into fleet-moved-to-hr
2017-01-17 11:05:39 +05:30
Nabin Hait
03f82240fa
Merge pull request #7222 from neilLasrado/assessment
...
Redesign Assessment Module
2017-01-17 11:04:02 +05:30
Dhaifallah Alwadani
9375d1dfeb
fix string translation
2017-01-16 04:05:40 -08:00
Stavros Anastasiadis
241e478dc0
Add Full Name as option in HR Setting Employee creation option
2017-01-16 14:02:28 +02:00
Rushabh Mehta
ffd80a6061
[fix] warehouse test cases
2017-01-16 17:23:20 +05:30
Rushabh Mehta
6695830f3f
[fix] warehouse test cases
2017-01-16 16:57:53 +05:30
Gaurav Naik
d9b4c52046
[Fix] Project: Enabled autocomplete for project users
2017-01-16 16:01:25 +05:30
Kanchan Chauhan
f80c2b9606
Fleet management moved to HR
2017-01-16 14:38:24 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
Nabin Hait
120461efef
Merge branch 'master' into develop
2017-01-16 13:04:54 +05:30
Nabin Hait
71a730a36f
bumped to version 7.2.12
2017-01-16 13:34:53 +06:00
KanchanChauhan
b89be1e193
[Minor] Demo fixes ( #7499 )
2017-01-16 12:57:14 +05:30
Neil Trini Lasrado
38bd62d82d
Merge branch 'develop' into assessment
2017-01-16 12:23:51 +05:30
Rushabh Mehta
4ad121e1a4
[minor] fixes for Contact
2017-01-16 12:19:21 +05:30
ci2014
820abd3ba4
Fix missing comma ( #7495 )
...
Fixed missing comma after method set_contact_link
2017-01-16 11:57:34 +05:30
Nabin Hait
47bdf8b659
Merge pull request #7490 from rohitwaghchaure/pos_discount_issue
...
[Fix] Discount not working in the POS
2017-01-16 11:44:50 +05:30
Rohit Waghchaure
685f89f2b7
[Fix] Discount not working in the POS
2017-01-14 20:47:56 +05:30
Rushabh Mehta
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +05:30
Rushabh Mehta
c0bfb0ba56
[fix] contact and address for demo
2017-01-13 23:05:56 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
Nabin Hait
448acf6f46
Merge branch 'master' into develop
2017-01-13 17:30:46 +05:30
Nabin Hait
3d26ddd790
bumped to version 7.2.11
2017-01-13 18:00:45 +06:00
Nabin Hait
e7cb911634
Salary Slip Patch Fixed
2017-01-13 17:30:06 +05:30
Nabin Hait
26ac85be5b
Merge branch 'master' into develop
2017-01-13 17:10:52 +05:30
Nabin Hait
fd7f3240b4
bumped to version 7.2.10
2017-01-13 17:40:51 +06:00
Nabin Hait
b166caa9fb
Patch fixed
2017-01-13 17:09:57 +05:30
robert schouten
7a3d418aa5
Email inbox based off of frappe email inbox pr ( #7308 )
...
* email inbox
* inbox fixes
* separate email-inbox to pass tests
* separate email-inbox to pass tests
* fix import
* add more info to contact and address
2017-01-13 14:51:09 +05:30
Rushabh Mehta
af077dc616
[minor] fix for custom perms
2017-01-13 14:47:37 +05:30
Nabin Hait
b251cd4ccb
Fixed merge conflict
2017-01-13 14:34:54 +05:30
Nabin Hait
45cad45420
bumped to version 7.2.9
2017-01-13 15:03:56 +06:00
Nabin Hait
e43a94de4b
Merge branch 'hotfix' into draft_status_issue_after_amend
2017-01-13 13:14:32 +05:30
Nabin Hait
9698f1b923
Merge pull request #7473 from KanchanChauhan/salary-slip-before-june
...
Patch to add Start and End Date in Salary Slips
2017-01-13 12:53:15 +05:30
Rohit Waghchaure
29458836e4
[Fix] After amend the status become cancelled even if docstatus is zero
2017-01-13 12:51:19 +05:30
robert schouten
1a92d54dcb
[fix] profiability analasyis orderby cost center name
2017-01-13 14:52:11 +08:00
Kanchan Chauhan
b6114e672f
Patch to add Start and End Date in Salary Slips
2017-01-13 12:05:03 +05:30
Nabin Hait
4bd42146ba
Merge pull request #7462 from rohitwaghchaure/minor_pos_issue
...
[Fix] POS issues
2017-01-13 11:55:52 +05:30
Nabin Hait
ba2a76cfb7
Merge pull request #7453 from KanchanChauhan/salary-register-report
...
Changes to Salary Register
2017-01-13 11:51:48 +05:30
Nabin Hait
8f0c060578
Merge pull request #7447 from saurabh6790/tree_param_fix
...
[fix] provision to handle custom mandatory params while creating node
2017-01-13 11:50:18 +05:30
Nabin Hait
17cd36b7d5
Merge pull request #7451 from saurabh6790/chequeprint_date_fix
...
[minor][fix] show date in user format
2017-01-13 11:36:12 +05:30
Nabin Hait
90de12fea3
Merge pull request #7446 from KanchanChauhan/fieldtype-edit-desc
...
[Minor] Field type of Description field changed to Text Editor
2017-01-13 11:34:51 +05:30
Nabin Hait
007c87ea63
Merge pull request #7440 from nabinhait/gle_repost_optimization
...
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
robert schouten
d56627f2b7
[fix] profiability analasyis orderby project name
2017-01-13 11:53:43 +08:00
Felipe Orellana
ac81440a81
[FIX] Contact form breaks on existing lead
...
When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.
2017-01-12 12:08:20 -05:00
Kanchan Chauhan
7933eb685c
[Enhancement] Attendance Module
2017-01-12 17:24:53 +05:30
Rohit Waghchaure
8afe267813
[Fix] POS issues
2017-01-12 15:22:02 +05:30
Kanchan Chauhan
2f3ae914a6
Changes to Salary Register
2017-01-11 19:45:01 +05:30
Ben Cornwell-Mott
1cd7e54822
Adds button to find MRs linked to Supplier
2017-01-11 03:05:49 -08:00
Saurabh
056276c60e
[minor][fix] show date in user format
2017-01-11 15:50:09 +05:30
RicardoJohann
7182de7684
allowed rename salary structure
2017-01-11 06:28:59 -02:00
Saurabh
2f02101d7d
[fix] provision to handle custom mandatory params while creating node
2017-01-11 12:41:01 +05:30
Kanchan Chauhan
595cfb9f17
[Minor] Field type of Description field changed to Text Editor
2017-01-11 12:03:15 +05:30
Nabin Hait
0287d31c0f
Fetch bin details after setting warehouse based on POS Profile
2017-01-11 10:31:45 +05:30
Nabin Hait
c0eab41ec5
Fix for Budget against Project
2017-01-11 10:16:19 +05:30
Ben Cornwell-Mott
3d491f90cc
Created 2 reports for stock details
2017-01-10 14:14:18 -08:00
Neil Trini Lasrado
2a9e0f6fd8
Added assessment result tool
2017-01-10 17:32:02 +05:30
Nabin Hait
9e08ccdf39
Merge pull request #7425 from KanchanChauhan/sync-projecttask-task
...
Sync Project Task and Task
2017-01-10 17:26:51 +05:30
Nabin Hait
1612fa1253
Merge pull request #7426 from nabinhait/hotfix
...
Show values based on precision and filter out zero value rows
2017-01-10 17:26:27 +05:30
Nabin Hait
20aba32318
Merge pull request #7427 from KanchanChauhan/projects-manager-role
...
[Minor] Added Projects Manager role
2017-01-10 17:25:16 +05:30
Kanchan Chauhan
c4aceaad7f
[Minor] Added Projects Manager role
2017-01-10 16:35:54 +05:30
Nabin Hait
5dd988207f
Show values based on precision and filter out zero value rows
2017-01-10 16:10:40 +05:30
Kanchan Chauhan
4a15fa4c86
Sync Project Task and Task
2017-01-10 16:01:38 +05:30
Rushabh Mehta
d40e661ebd
[style] better demo start page
2017-01-10 14:46:54 +05:30
Nabin Hait
51d45d8bce
Fixed merge conflict
2017-01-10 12:32:01 +05:30
Nabin Hait
4180a37773
bumped to version 7.2.8
2017-01-10 13:00:09 +06:00
Nabin Hait
a7f616564e
Merge pull request #7417 from KanchanChauhan/quick-entry-for-item
...
[Minor] Valuation rate in Quick entry for Item
2017-01-10 12:23:36 +05:30
Nabin Hait
01baceb74e
Revert "proposed usage of daterange picker"
2017-01-10 12:19:48 +05:30
Kanchan Chauhan
43e07aed2c
[Minor]Valuation rate in Quick entry for Item
2017-01-10 12:06:51 +05:30
Nabin Hait
9215581345
Merge pull request #7414 from KanchanChauhan/timesheet-payroll-frequency-toggle
...
[Fix] Payroll Frequency toggle fix
2017-01-10 11:58:36 +05:30
Kanchan Chauhan
2b41f9d548
[Fix] Payroll Frequency toggle fix
2017-01-09 18:43:52 +05:30
Neil Trini Lasrado
5a30467ae5
Added test case
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
a56224c03a
Rename Assessment to Assessment Plan
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
233ecfdd9c
Renamed min_score to threshold in Grading Scale
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
577cfd559f
Removed LMS code in Course master
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
5c87455918
Patch for assessment module redesign
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
06ed74dc7c
Redesign Assessment Module
2017-01-09 18:26:02 +05:30
Nabin Hait
ec793b4846
Merge branch 'hotfix' of git://github.com/frappe/erpnext into hotfix
2017-01-09 17:24:10 +05:30
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
a2fae844b6
Merge pull request #7410 from RobertSchouten/timesheet_overlap_validation
...
[fix] timesheet overlap validation not including modified timesheet
2017-01-09 17:15:40 +05:30
Nabin Hait
2bb9093b9a
bumped to version 7.2.7
2017-01-09 17:27:10 +06:00
Nabin Hait
f0c41b5709
Merge pull request #7412 from nabinhait/hotfix
...
Allow fetching same items multiple times from source doc if all qty not processed
2017-01-09 16:00:08 +05:30
Nabin Hait
23b836dcdb
Merge pull request #7386 from arvindstutzen/patch-1
...
Update step-8-customer-names.md
2017-01-09 15:55:38 +05:30
Nabin Hait
297ae85c31
Merge pull request #7409 from RobertSchouten/daterangecontrol
...
proposed usage of daterange picker
2017-01-09 15:55:17 +05:30
Nabin Hait
1839fcca11
Merge pull request #7406 from saurabh6790/terms_and_cond_fix
...
[fix] if terms exists then only call render_template
2017-01-09 15:49:56 +05:30
Nabin Hait
d1eb237909
Merge pull request #7400 from rohitwaghchaure/minor_issue
...
Get item default warehouse
2017-01-09 15:49:14 +05:30
Nabin Hait
a9b9edd9bc
Merge pull request #7392 from frappe/bcornwellmott-patch-2
...
Fix number of digits on report
2017-01-09 15:48:04 +05:30
Nabin Hait
802b4359b5
Fetch same items multiple times from source doc if all qty not processed
2017-01-09 15:32:20 +05:30
nick9822
6f48d4be1c
whitelisted erpnext.stock.utils.get_stock_balance ( #7402 )
...
whitelisted erpnext.stock.utils.get_stock_balance with respect to
https://github.com/frappe/erpnext/issues/7364
2017-01-09 12:12:36 +05:30
robert schouten
138c2f6b29
[fix] timesheet overlap validation not including modified timesheet
2017-01-09 12:50:35 +08:00
robert schouten
81130e848e
proposed usage of daterange picker
2017-01-09 08:38:27 +08:00
Saurabh
f65e8de5a5
[fix] if terms exists then only call render_template
2017-01-07 08:18:10 +05:30
bcornwellmott
34e34ed1e8
Trigger Restart of build checks
2017-01-06 17:21:16 -08:00
Rushabh Mehta
8b133ac087
[minor] [tests] fix, tests will fail on the 5th of a month!
2017-01-06 17:21:04 +05:30
Rohit Waghchaure
6734c4ad5c
Get item default warehouse
2017-01-06 14:39:40 +05:30
Nabin Hait
91621639e8
Reload in_standard_filter property
2017-01-06 12:54:16 +05:30
bcornwellmott
a3e7c38734
Fix number of digits on report
...
Currently the cells can show many digits.
2017-01-05 09:44:18 -08:00
Nabin Hait
59a67c3586
Update supplier_quotation.py
2017-01-05 14:58:30 +05:30
Arvind Subramanian
efc9372f46
Update step-8-customer-names.md
2017-01-05 08:34:58 +05:30
bhupen
107099aac9
you can make quotation from supplier quotation
2017-01-04 17:04:12 +05:30
Nabin Hait
d08c248642
Merge pull request #7354 from Scheercuzy/enlarge-item-image-website
...
Hyperlink on item image on website
2017-01-04 15:58:44 +05:30
britlog
35cefb1275
fix success_list if http status == 200 + utf-8 support + optional success message
2017-01-04 15:53:26 +05:30
Nabin Hait
8281b36a26
Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress
...
Email ID renamed to Email Address
2017-01-04 15:46:48 +05:30
Nabin Hait
f45851c245
Merge pull request #7379 from KanchanChauhan/accounts-reports
...
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-04 15:45:39 +05:30
Nabin Hait
0dab40f4a1
Merge pull request #7377 from KanchanChauhan/naming-series
...
[Fix] Naming series issue
2017-01-04 15:44:00 +05:30
Nabin Hait
96562e3eb7
Merge pull request #7362 from rmehta/minor-fixes
...
[minor] dont get warehouse in opening entry #7353
2017-01-04 15:42:23 +05:30
Nabin Hait
202bcc09d5
Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues
...
[Enhancement] POS features
2017-01-04 15:15:32 +05:30
Nabin Hait
3051a3dd97
Fixed test case for margin
2017-01-04 15:11:58 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Kanchan Chauhan
f4832cf2b9
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-03 16:29:41 +05:30
Scheercuzy
7c161cfff2
Merge remote-tracking branch 'frappe/develop' into enlarge-item-image-website
2017-01-03 16:03:43 +06:30
Kanchan Chauhan
0e8361d1de
[Fix] Naming series issue
2017-01-03 14:29:17 +05:30
Nabin Hait
1d88c65be4
Merge pull request #7374 from rohitwaghchaure/billed_report_enhancement
...
[Enhancement] Consolidated billed report, changed the report type from query to script
2017-01-02 17:40:51 +05:30
Nabin Hait
ab42fc006f
Merge branch 'master' into develop
2017-01-02 17:26:55 +05:30
Nabin Hait
1ecf613c3c
bumped to version 7.2.6
2017-01-02 17:56:54 +06:00
Nabin Hait
ceea71bcfc
Merge pull request #7365 from rohitwaghchaure/terms_and_condition
...
minor fix
2017-01-02 17:24:42 +05:30
Nabin Hait
b0e329b803
Merge pull request #7367 from saurabh6790/sms_log_fix
...
[fix] status check fix
2017-01-02 17:24:25 +05:30
Nabin Hait
506120936a
Merge pull request #7373 from KanchanChauhan/leave-for-absent
...
[Fix] Attendance validation in Leave Application
2017-01-02 17:23:45 +05:30
Nabin Hait
7fc18f359c
Currency symbol for budget amount based on company
2017-01-02 17:21:34 +05:30
Nabin Hait
92254d3930
Set serial nos in DN based on FIFO based on Stock Settings
2017-01-02 17:01:27 +05:30
Rohit Waghchaure
5a383e5cdd
[Enhancement] Consolidated billed report, changed type from query to script
2017-01-02 16:20:43 +05:30
Nabin Hait
06966e8e1d
minor fix
2017-01-02 15:10:01 +05:30
Kanchan Chauhan
5594050104
[Fix] Attendance validation in Leave Application
2017-01-02 11:14:44 +05:30
Rohit Waghchaure
cdbacf5398
minor fix
2016-12-30 17:06:01 +05:30
Saurabh
6bbed0297b
[fix] status check fix
2016-12-30 17:05:40 +05:30
KanchanChauhan
4601fdd98d
Better Salary Slip logs in Process Payroll ( #7322 )
2016-12-30 16:26:55 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
Nabin Hait
ce5f942678
Merge branch 'master' into develop
2016-12-30 15:54:32 +05:30
Nabin Hait
edb99f8750
bumped to version 7.2.5
2016-12-30 16:24:31 +06:00
Nabin Hait
4de4b56c60
Merge pull request #7363 from rohitwaghchaure/terms_and_conditions_for_company
...
set default terms and condition if tc_name is available on the form
2016-12-30 15:46:57 +05:30
Rohit Waghchaure
585448b225
set default terms and condition if tc_name is available on the form
2016-12-30 15:41:55 +05:30
Rushabh Mehta
985cb8226d
[minor] dont get warehouse in opening entry #7353
2016-12-30 15:06:54 +05:30
Nabin Hait
e97d40806f
Merge branch 'master' into develop
2016-12-30 14:56:20 +05:30
Nabin Hait
5105b1e789
bumped to version 7.2.4
2016-12-30 15:26:19 +06:00
Nabin Hait
dc0a277085
Merge pull request #7355 from manassolanki/hotfix
...
Fetching the item details from the reference doctype in QI
2016-12-30 14:10:21 +05:30
Nabin Hait
fa2feae314
Merge pull request #7359 from nabinhait/hotfix
...
[fix] Make Journal Entry against SO
2016-12-30 12:38:56 +05:30
Kanchan Chauhan
7b29dc7208
[Fix] Monthly Salary Register Fix
2016-12-30 12:36:00 +05:30
Nabin Hait
9646be1d5d
[fix] Make Journal Entry against SO
2016-12-30 11:14:41 +05:30
Rushabh Mehta
a8326de4d0
[fix] on_update in item.py
2016-12-30 06:17:45 +05:30
Rushabh Mehta
2097ccfaea
[fix] item_group.py #7358
2016-12-30 06:09:41 +05:30
Manas Solanki
5c82e9ef8b
Fetching the item details from the reference doctype in quality inspection
...
Error Report [2016-12-29]
2016-12-29 18:01:25 +05:30
Scheercuzy
f483582957
Hyperlink Item Image
...
added hyperlink on item image
2016-12-29 18:56:44 +06:30
Nabin Hait
f327a58b7f
Merge branch 'master' into develop
2016-12-29 11:04:05 +05:30
Nabin Hait
3d98d23e22
bumped to version 7.2.3
2016-12-29 11:34:05 +06:00
Nabin Hait
11bde0ba14
Patch fixed
2016-12-29 10:58:05 +05:30
Nabin Hait
2469f247df
Merge pull request #7341 from StrellaGroup/develop
...
Fixed spelling errors on Production Planning Tool and manual.
2016-12-28 17:12:01 +05:30
Neil Trini Lasrado
986927ca98
Added Guardian to school module
2016-12-28 16:15:35 +05:30
Muhammad Huzaifah Bin Ismail
465da8ce09
Fixed spelling errors on Production Planning Tool and manual.
2016-12-28 18:15:45 +08:00
Rohit Waghchaure
bef185c404
restrict user to edit the rate in the POS
2016-12-28 15:16:49 +05:30
Neil Trini Lasrado
0152516ba4
[Fix] Student Monthly Attendance Sheet
2016-12-28 13:01:14 +05:30
Rushabh Mehta
94c4d7014d
[fix] item_name in stock reco
2016-12-28 06:56:09 +05:30
Rohit Waghchaure
249bc6167f
fix company issue
2016-12-28 00:20:08 +05:30
Rohit Waghchaure
aa9b8603b9
added paid amount in print format
2016-12-27 17:43:23 +05:30
Rohit Waghchaure
fe7a5b305f
create customer from POS
2016-12-27 17:31:32 +05:30
Rohit Waghchaure
8c9c9cfc5f
When a new company is made, cash account should be automatically set for Mode of Payment
2016-12-27 17:31:32 +05:30
Rushabh Mehta
5cb1b6bf3f
[minor] translation fix
2016-12-27 16:30:20 +05:30
Nabin Hait
3bcf9b5e70
Fixed merge conflict
2016-12-27 14:30:17 +05:30
Nabin Hait
89c8b4d6ae
bumped to version 7.2.2
2016-12-27 14:57:19 +06:00
Rushabh Mehta
174c3478a1
[fix] item variants not directly shown in website due to route clash
2016-12-27 12:30:30 +05:30
Rushabh Mehta
512b85e040
[minor] replace autocomplete with awesomplete
2016-12-27 12:14:37 +05:30
Rushabh Mehta
e60c2c7b7a
[minor] dashboard cleanups
2016-12-27 12:14:37 +05:30
Neil Trini Lasrado
22239ac610
Improved Student Dashboard
2016-12-26 17:14:16 +05:30
Nabin Hait
88817b40df
Merge pull request #7284 from mntechnique/develop
...
Report : Batch Item Expiry Status
2016-12-26 16:10:46 +05:30
Nabin Hait
4573029a5e
Merge pull request #7292 from frappe/bcornwellmott-patch-1
...
Add hours to calendar labels
2016-12-26 16:09:11 +05:30
Nabin Hait
0631d516ce
Merge pull request #7290 from netchampfaris/pos-item-area-scroll
...
pos item area scrollable
2016-12-26 16:07:38 +05:30
Nabin Hait
c2690425e3
Merge pull request #7310 from bhupennewalkar1337/hotfix
...
Fix #7202 unchecking pos will reflect automatically
2016-12-26 16:07:19 +05:30
Nabin Hait
488ad54bbc
Merge pull request #7280 from neilLasrado/leave
...
Added mark as present to student leave application
2016-12-26 16:06:44 +05:30
Neil Trini Lasrado
df4b9ab630
Optimised code for Student Monthly Attendance Report
2016-12-26 15:40:01 +05:30
Nabin Hait
7b2177a544
[test] Fixed test cases for LCV
2016-12-26 15:31:05 +05:30
Neil Trini Lasrado
94f42ea145
Added from date and to date to student leave application
2016-12-26 12:09:27 +05:30
Neil Trini Lasrado
9a7cb6ce92
Added mark as present to student leave application
2016-12-26 12:09:27 +05:30
Nabin Hait
61a190dd69
Merge branch 'master' into develop
2016-12-24 11:01:26 +05:30
Nabin Hait
8b3e39ed27
bumped to version 7.2.1
2016-12-24 11:31:25 +06:00
Nabin Hait
1d90b41aea
[fix] Fetch serial nos on change of Warehouse
2016-12-24 10:42:23 +05:30
bhupen
bcf63a2a8f
unchecking pos will reflect automatically
2016-12-23 18:00:18 +05:30
Nabin Hait
ba95fc4fa0
Fixed version conflict
2016-12-23 17:44:05 +05:30
Nabin Hait
58291c77e9
Fixed version conflict
2016-12-23 17:43:42 +05:30
Nabin Hait
90c57e5ffd
bumped to version 7.2.0
2016-12-23 18:13:13 +06:00
Nabin Hait
aad8527ff3
Update __init__.py
2016-12-23 17:00:17 +05:30
Nabin Hait
c2d66bdfb2
Merge branch 'master' into develop
2016-12-23 16:45:09 +05:30
Nabin Hait
11c5da1d8c
bumped to version 7.1.29
2016-12-23 17:15:07 +06:00
Nabin Hait
aa2d949f61
Merge pull request #7295 from bhupennewalkar1337/lcv
...
Fix#3717 entering amount in lcv is enabled
2016-12-23 15:49:07 +05:30
Nabin Hait
1e1e28b0ae
Update landed_cost_voucher.js
2016-12-23 15:48:57 +05:30
Nabin Hait
06c6628481
Merge pull request #7279 from KanchanChauhan/automate-user-creation
...
Create User button in Employee if no User ID selected
2016-12-23 15:31:55 +05:30
Nabin Hait
0177c02c0f
Merge pull request #7286 from rohitwaghchaure/pos_letter_head_issue
...
minor fix
2016-12-23 15:19:32 +05:30
Nabin Hait
0e9f16f59d
Merge pull request #7289 from rohitwaghchaure/enhancement_timesheet_v7_2
...
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
2016-12-23 15:18:28 +05:30
Nabin Hait
6104fdc579
Update repost_stock_for_deleted_bins_for_merging_items.py
2016-12-22 17:49:46 +05:30
bhupen
a83de5eac1
applicabe charges field is now editable
2016-12-22 16:24:14 +05:30
bhupen
914ae77a22
Limit instead of Allowance in stock settings
2016-12-22 16:24:14 +05:30
bhupen
5bb85e7a95
partially orderd status will be shown in material request
2016-12-22 16:24:14 +05:30
bcornwellmott
e549984a42
Grabs title from SQL
...
Gets a concatenated title label for the Calendar event that includes the number of hours
2016-12-21 12:36:45 -08:00
bcornwellmott
3385bd4921
Add hours to label in calendar view
...
Adds a label for the number of hours to each calendar event
2016-12-21 12:33:32 -08:00
Rohit Waghchaure
1af1a43616
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
2016-12-21 19:19:16 +05:30
Faris Ansari
0822e41f96
pos item area scrollable
2016-12-21 18:17:00 +05:30
Revant Nandgaonkar
1c00b1fb21
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2016-12-21 18:01:35 +05:30
Rohit Waghchaure
dd58d537d5
[Fix] POS issue for serialized items
2016-12-21 17:55:40 +05:30
Rushabh Mehta
0632ee3da9
Merge branch 'v7.2.0-beta' into develop
2016-12-21 17:31:09 +05:30
Rushabh Mehta
c6bd7ade2f
[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253
2016-12-21 17:30:29 +05:30
Kanchan Chauhan
58ed0c6efa
Create User button in Employee if no User ID selected
2016-12-21 16:18:59 +05:30
Revant Nandgaonkar
00e65cb70b
Report - Batch Item Expiry Status
...
Changed column name `Expiry Status` to `Expiry (In Days)`
Changed column type from Data to Int
2016-12-21 14:21:53 +05:30
Rohit Waghchaure
9df946e96c
[Fix] Warehouse is mandatory for packing materials on the sales invoice
2016-12-21 13:27:54 +05:30
Rohit Waghchaure
d567e57f82
minor fix
2016-12-21 13:18:36 +05:30
Revant Nandgaonkar
c30ae28422
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2016-12-21 12:52:23 +05:30
Revant Nandgaonkar
0766d3e67e
Report : Batch Item Expiry Status
...
Select From Date and To Date
Lists Items about to expire or already expired
Expiry Status column shows number of days in which item/batch will expire
2016-12-21 12:32:12 +05:30
Nabin Hait
e7939fd87b
Merge branch 'master' into develop
2016-12-21 12:18:38 +05:30