Saqib
b8bcad5850
fix: gl not generated on manual asset creation ( #20265 )
2020-01-13 18:17:05 +05:30
Deepesh Garg
2d151a7b85
fix: Remove patch to set automatic tax fetching from item tax template ( #20234 )
2020-01-13 15:09:27 +05:30
Suraj Shetty
06ed72a859
Merge branch 'develop' into cancel_frappe_1
2020-01-13 15:08:23 +05:30
Deepesh Garg
70a58d333b
Merge pull request #20245 from nextchamp-saqib/asset-cancel-fix
...
fix: auto cancel if movement exists
2020-01-13 14:44:45 +05:30
Deepesh Garg
16b8673554
Merge pull request #20257 from nextchamp-saqib/revery-jv-fix
...
fix: remove default customer as party type
2020-01-13 13:48:55 +05:30
vishal
dcef798be7
fix: minor changes
2020-01-13 12:59:52 +05:30
vishal
1dd289450f
fix: docstring for auto cancel
2020-01-13 12:59:18 +05:30
vishal
eef05758b6
feat: Added docinfo for auto cancel exempt doctypes
2020-01-13 12:59:18 +05:30
vishal
70148a6748
feat: docstring added for auto cancel exempt doctypes
2020-01-13 12:59:12 +05:30
thefalconx33
f04d054faa
fix: remove default customer as party type
2020-01-13 12:43:49 +05:30
Rohit Waghchaure
ecdfc1a15c
fix: allow on submit for the delivery date field
2020-01-13 12:43:26 +05:30
thefalconx33
1e7a127dfa
fix: auto cancel if movement exists
2020-01-11 14:19:02 +05:30
deepeshgarg007
00746306a3
fix: Item tax template fetching from HSN Code
2020-01-10 15:01:50 +05:30
gavin
12568e4f07
Merge pull request #19514 from gavindsouza/rename-doc-fix
...
fix: frappe.rename_doc update
2020-01-09 15:07:05 +05:30
rohitwaghchaure
d4d7d211ea
feat: report to show difference between stock and account value ( #20186 )
2020-01-09 15:05:05 +05:30
Suraj Shetty
000ac0068b
Merge branch 'develop' into rename-doc-fix
2020-01-09 13:46:08 +05:30
Marica
287f491f7b
fix: Employee name in Report trial balance for party ( #20223 )
...
* fix: Employee name in Report trial balance for party
* fix: Add account filter in trial balance for party report
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-01-09 13:35:06 +05:30
Pranav Nachnekar
1612432f45
fix: parent item should not appear in raw material request dialog ( #20216 )
2020-01-09 13:32:15 +05:30
Don-Leopardo
ccdf19314d
fix: min_qty and valid_from for the price selection ( #20217 )
2020-01-09 12:24:43 +05:30
Pranav Nachnekar
229e5398b5
fix: escape % in customer name ( #20202 )
2020-01-09 12:21:26 +05:30
Marica
c72de6edaa
fix: Added description and title to supplier selection popup in Material Request. ( #20179 )
2020-01-07 13:06:08 +05:30
Vishal Dhayagude
7ae11005c4
fix: UX improvement. move trigger on fieldname restrict_backdated_leave_application ( #20211 )
2020-01-07 13:02:13 +05:30
Vishal Dhayagude
6b316cd7cb
feat: Backdated leave application ( #20201 )
...
* fix: only HR Managers can make backdated leave applications
* fix (leave application): error message changed and user check modified
* fix: Move hardcoded logic to HR Settings
* fix: added role as mandetory field on check restict field
* fix: minor changes
2020-01-07 11:48:38 +05:30
Wolfram Schmidt
aab96b7fbf
Update de.csv ( #20205 )
...
changed translation of "leave/-s" to "Urlaub/Urlaubstage" instead of "Blätter" (Blätter is leaves as in tree or sheet as in paper)
2020-01-07 11:37:08 +05:30
sahil28297
88737e38f2
fix(item_tax_template): fetch parent account if not set ( #20198 )
2020-01-07 11:30:22 +05:30
Pranav Nachnekar
971458043d
fix: add new delivery note button in Sales Order ( #20199 )
...
* fix: add new delivery note button in Sales Order
* fix: removed debugger
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-01-07 11:29:35 +05:30
Rohan
7c8aaba449
fix: integer UOM check in transactions ( #20176 )
2020-01-07 11:23:53 +05:30
Deepesh Garg
ef0d26c161
feat: Validity for Item taxes ( #20135 )
...
* feat: Validity for Item taxes
* fix: Trigger for gst hsn code
* fix: Sort taxes based on validity
* fix: Validation for item tax template and filters based on validity
* fix: Add missing semicolon
* fix: Validate tax template only if item code available
* fix: Do not validate or filter item tax template if no item taxes applied
* fix: Consider item group for validating taxes
* fix: Test cases for item tax validation
* fix: Item tax template filtering fixes
* fix: Add missing semicolon
* fix: Remove unnecessary query
2020-01-06 15:34:15 +05:30
rohitwaghchaure
b5f91bea90
Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request
...
fix: incorrect party type in payment request
2020-01-06 15:16:42 +05:30
Rohit Waghchaure
8641f9ce77
fix: party type in payment request
2020-01-06 15:07:06 +05:30
rohitwaghchaure
055012a7fb
Merge pull request #20170 from nabinhait/inter-company-serial-no-outgoing-rate
...
fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company
2020-01-06 12:07:53 +05:30
rohitwaghchaure
fe2afc643e
fix: incorrect valuation rate for finished good entry ( #20165 )
2020-01-06 11:51:43 +05:30
Deepesh Garg
92f3149a64
Merge pull request #20185 from mujeerhashmi/fee-write-off
...
feat: Allow write-off for Fees doctype in journal entry.
2020-01-06 08:09:16 +05:30
Himanshu
9496b8453f
fix(plaid): change json structure ( #20189 )
2020-01-06 00:17:16 +05:30
Syed Mujeer Hashmi
03bf1a875f
feat: Allow write-off for Fees doctype
...
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-01-04 13:26:42 +05:30
Marica
159799c238
Merge branch 'develop' into item-min-qty
2020-01-03 12:13:00 +05:30
rohitwaghchaure
52c5fb33d7
Merge pull request #20169 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule_develop
...
fix: ignore pricing rule for other item group
2020-01-02 19:24:37 +05:30
thefalconx33
7a01367ef1
ux: add description for minimum purchase qty
2020-01-02 19:14:55 +05:30
Nabin Hait
328c4f9b92
fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company
2020-01-02 19:00:47 +05:30
Rohit Waghchaure
660a78b877
fix: ignore pricing rule for other item group
2020-01-02 17:31:09 +05:30
deepeshgarg007
473b478883
fix: Show closing row in general ledger print
2020-01-02 12:22:04 +05:30
Raffael Meyer
5d6fada431
feat: add accounts and account types
2020-01-01 22:55:54 +01:00
Rucha Mahabal
2d293c585e
fix(Subscription): pass start_date while computing next_schedu… ( #20159 )
2019-12-31 19:15:37 +05:30
Anurag Mishra
8554304616
fix: set currency to company default currency ( #20157 )
2019-12-31 17:23:31 +05:30
Rohan
938ba3efc4
feat: show item name in Item Price list view ( #20156 )
2019-12-31 17:21:07 +05:30
Saqib
440a3b75be
fix: don't show transfer button if already items are supplied ( #20154 )
2019-12-31 17:20:04 +05:30
Nabin Hait
5748cde54b
fix: minor field arrangements
2019-12-31 17:18:15 +05:30
Anurag Mishra
d2eae9fbcf
fix: Atendance Request, Employee Skill Map, Leave Encashment form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
b57ec65812
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
52d280067b
fix: Leave Type form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
cfdbbcff70
fix: Employee incentive form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
39ecd6ee1e
fix: Expense calim form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
ec9000b6b9
fix: Employee form UI
2019-12-31 17:18:14 +05:30
Anurag Mishra
bd6e8b9cec
feat: Mark Unmarked Attendance ( #20062 )
...
* feat: Mark Unmarked Attendance
* Update shift_type.py
* Update attendance_list.js
* Update attendance.py
* Update attendance.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-31 17:09:56 +05:30
Rohan
b73b347697
feat: add job applicant's email in job offer ( #20153 )
2019-12-31 17:09:02 +05:30
Javier Wong
5cc7648e9c
[Fix] Allow Print Before Pay in POS ( #20151 )
...
Print Button does not show even when Print Before Pay is enabled in the POS Profile.
2019-12-31 17:07:37 +05:30
Saqib
71649fe141
fix: customer credit limit label ( #20152 )
2019-12-31 17:05:34 +05:30
Deepesh Garg
2bc7e2881a
Merge pull request #20149 from nextchamp-saqib/rounded-total-ss
...
feat: added provision to disable rounded total for salary slips
2019-12-31 17:02:14 +05:30
thefalconx33
88de158378
feat: added provision to disable rounded total for salary slips
2019-12-31 15:27:30 +05:30
Saqib
cb7043fd9d
fix: party account currency not fetched from account for SO ( #20146 )
2019-12-31 13:55:13 +05:30
Marica
5483f1a27e
fix: Field 'other_charges_calculation' column type changed. ( #20141 )
2019-12-30 22:20:02 +05:30
Rucha Mahabal
3ac39ba28d
fix: format currency field in bank and cash payment voucher print format ( #20137 )
2019-12-30 15:18:07 +05:30
rohitwaghchaure
9af557f9d7
fix: incorrect batch fetched for the serialized items ( #20119 )
...
* fix: incorrect batch fetched for the serialized items
* Update stock_controller.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-30 13:26:47 +05:30
Ishan Loya
fe0adc8b25
fix: read WIP warehouse from work order ( #20131 )
...
* fix: read wip_warehouse from work order in stock entry even if skip transfer is checked
* fix: remove skip_transfer in stock entry
Related to #10753
2019-12-30 12:19:08 +05:30
rohitwaghchaure
59a835602a
fix: service item's cost showing incorrect amount in stock entry ( #20106 )
2019-12-30 11:42:06 +05:30
Deepesh Garg
e90126f7ab
Merge pull request #20123 from nextchamp-saqib/so-update-items
...
fix: don't allow deletion of items which has work order assigned to it
2019-12-28 21:01:17 +05:30
Deepesh Garg
b914cf0a9d
Merge pull request #19815 from Mangesh-Khairnar/publish-item
...
feat(marketplace): allow user to un-publish item
2019-12-28 17:52:49 +05:30
Deepesh Garg
4f1fcdd4a7
Merge pull request #20125 from marination/stock-module-desk
...
chore: Added Reports to Stock Module Desk
2019-12-28 17:45:06 +05:30
marination
126a63af26
chore: Added Reports to Stock Module Desk
2019-12-27 17:18:27 +05:30
Rohan
901fe4785c
fix: employee preferred email patch ( #20116 )
2019-12-27 17:07:35 +05:30
Ishan Loya
b2a1ae77ce
Remove default BOM filter in Work Order ( #20117 )
...
Not all companies use default BOM (e.g. construction companies, etc.)
2019-12-27 17:06:34 +05:30
Marica
f4fbdf98d1
fix: Removed unneccesary Duplicate Entry Error. ( #20120 )
2019-12-27 16:53:05 +05:30
thefalconx33
2073eeb8fa
fix: don't allow deletion of items which has work order assigned to it
2019-12-27 16:26:03 +05:30
Marica
47ab9850e6
fix: Show both warehouse columns in Stock Entry Grid view. ( #20113 )
2019-12-27 15:31:07 +05:30
Mangesh-Khairnar
c7ce597b7f
fix: return when Hub Tracked Item is empty
2019-12-27 14:48:14 +05:30
Saqib
7e57ede35b
fix: unpaid invoices are created even if current invoice is paid ( #20081 )
2019-12-27 13:02:13 +05:30
Deepesh Garg
467dba1954
fix: Patch incorrect GST category in invoices ( #20084 )
...
* fix: Patch to set GST category for unregistered invoice
* fix: Move patch up in line
2019-12-27 12:58:19 +05:30
Mangesh-Khairnar
cca6fb2794
Merge branch 'develop' into publish-item
2019-12-27 12:55:28 +05:30
rohitwaghchaure
4d806033af
Merge pull request #19335 from PawanMeh/feat_19334
...
feat(regional): Italian Localization and Passive invoicing cycle
2019-12-27 12:48:46 +05:30
rohitwaghchaure
616431d7c3
fix: incorrect reorder level in stock balance report ( #20111 )
2019-12-27 12:35:58 +05:30
Rohan
e944f7ac05
fix: Add Serial No button prompt ( #20099 )
2019-12-27 12:34:36 +05:30
rohitwaghchaure
a99f926a4b
fix: incorrect validation for scrap items ( #20109 )
2019-12-27 12:21:15 +05:30
Nabin Hait
8f3fea63b1
Merge branch 'develop' into publish-item
2019-12-27 12:19:02 +05:30
Saqib
8774c869d7
fix: first name not fetched from job offer applicant name ( #20093 )
2019-12-27 12:15:20 +05:30
Mangesh-Khairnar
8768d5d396
fix: fetch opening accumulated depreciation ( #20095 )
2019-12-27 12:14:46 +05:30
rohitwaghchaure
5b889ef864
Merge pull request #20079 from nabinhait/rounding-adjustment-dev
...
fix: rounding adjustment while both inclusive tax and discount amount present
2019-12-27 11:51:50 +05:30
Deepesh Garg
1a2e4fa36d
Merge pull request #20087 from nextchamp-saqib/pay-reco-fix
...
fix: undefined dr_or_cr_notes in case of party type Employee
2019-12-27 08:13:09 +05:30
thefalconx33
61bd6ccc2b
fix: travis failing for leave application test
2019-12-26 18:27:58 +05:30
deepeshgarg007
bd1da65098
fix: Update modified date
2019-12-26 18:26:13 +05:30
deepeshgarg007
0b9a98ad43
fix: Add against blanket order field in sales order
2019-12-26 18:15:13 +05:30
deepeshgarg007
8857d87c5b
fix: Travis
2019-12-26 17:34:02 +05:30
Deepesh Garg
4ee6e37fc3
Merge pull request #20091 from nextchamp-saqib/account-period
...
fix: only show doctypes which impact accounting in accounting period
2019-12-26 17:18:08 +05:30
Deepesh Garg
3f7a1a736c
Merge pull request #20090 from geniusupgrader/develop
...
fix: fix to issue #20089
2019-12-26 16:06:10 +05:30
thefalconx33
81d0861506
fix: undefined dr_or_cr_notes in case of party type Employee
2019-12-26 14:42:11 +05:30
thefalconx33
6291ca8e40
fix: only show doctypes which impact accounting in accounting period
2019-12-26 13:55:35 +05:30
Saqib
7519436260
Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos
...
feat: provision to select the custom fields in the online POS
2019-12-26 13:40:43 +05:30
Robin Rosenstock
e6387f9dca
fix to issue #20089
2019-12-26 08:09:47 +00:00
Rohit Waghchaure
2469fb9e35
fix: rounded total issue
2019-12-26 13:26:39 +05:30
Pawan Mehta
6e1ba43c3c
code fixes
2019-12-26 12:14:33 +05:30
Rohit Waghchaure
2c13a0533b
code cleanup
2019-12-26 12:14:32 +05:30
Pawan Mehta
bc40161d08
add ignore mandatory flag
2019-12-26 12:13:27 +05:30
Pawan Mehta
c3bb04ccb8
code improvements
2019-12-26 12:13:27 +05:30
hello@openetech.com
39b54cb889
validation change
2019-12-26 12:13:27 +05:30
hello@openetech.com
e9377e2513
review changes
2019-12-26 12:13:27 +05:30
hello@openetech.com
eb87566fa6
log encoding exception
2019-12-26 12:13:27 +05:30
hello@openetech.com
9e0762e8c2
code review changes
2019-12-26 12:13:27 +05:30
hello@openetech.com
5b33765a8c
discount handling
2019-12-26 12:13:27 +05:30
hello@openetech.com
90f170c376
code improvement
2019-12-26 12:13:27 +05:30
hello@openetech.com
c8e64235c0
codacy fixes
2019-12-26 12:13:27 +05:30
hello@openetech.com
309913bbdf
fix codacy issues
2019-12-26 12:13:27 +05:30
hello@openetech.com
5fadd355df
add naming series option
2019-12-26 12:13:27 +05:30
hello@openetech.com
fa8159efa3
mop options fix
2019-12-26 12:13:27 +05:30
hello@openetech.com
9964ad7870
python 2.7 fixes
2019-12-26 12:13:27 +05:30
hello@openetech.com
7021402a45
[feat] #19334
2019-12-26 12:13:27 +05:30
Rohit Waghchaure
682273a00b
feat: provision to select the custom fields in the online POS
2019-12-26 11:59:19 +05:30
Mangesh-Khairnar
d19bd8f0dd
Merge branch 'develop' into publish-item
2019-12-25 22:10:33 +05:30
Nabin Hait
a68ebdd008
Merge branch 'develop' into rounding-adjustment-dev
2019-12-25 15:18:12 +05:30
Himanshu
e2ea11c437
fix: remove quote ( #20076 )
2019-12-25 15:15:35 +05:30
Parth J. Kharwar
8c4cf12c93
Setting preferred driver email in delivery trip ( #19832 )
...
* fix: add driver's preferred contact email in delivery trip
* fix: modify driver's preferred email patch and blank field checks
* fix: patch file fix
* fix: patch changes to improve speed
* fix: removal of conflicts
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-25 15:14:52 +05:30
Nabin Hait
f32fc230f7
fix: rounding adjustment while both inclusive tax and discount amount present
2019-12-25 14:01:38 +05:30
rohitwaghchaure
6e8a9286c2
fix: multiple stock entry issues for the work order ( #18686 )
...
* fix: multiple stock entry issues for the work order
* Update work_order.py
* Update work_order.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-24 18:53:32 +05:30
Rohan
7372672044
fix: pull serial numbers linked to batches + pull warehouse correctly (develop) ( #19022 )
...
* fix: pull serial numbers according to set warehouses
* fix: handle purchase returns
2019-12-24 18:19:58 +05:30
DeeMysterio
df3b4e48fe
fix(adress): get the address title at the top and mandatory in display ( #20074 )
2019-12-24 18:10:18 +05:30
Khushal Trivedi
dd42dbc6a3
fix: date validation on student form, instructor duplicate fix on student grp, instructor with same employee id fix ( #20072 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix: joining and relieving Date can be on same date as valid use case
* fix-education: date of birth validation
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
* fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix
* fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix
* fix: Exclude current record while validating duplicate employee
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-24 18:07:09 +05:30
Mitchy25
fee8340f98
fix: Bank Reconciliation Allows to Over Reconcile ( #19461 )
...
* Update bank_reconciliation.py
* fix: improve error message while over reconciling
* fix: only check over-reconciliation when against payment entry
Co-authored-by: Saqib <thefalconx33@gmail.com>
2019-12-24 18:02:18 +05:30
Mangesh-Khairnar
0143f7c59d
patch: set published in hub track item
2019-12-24 17:45:57 +05:30
Mangesh-Khairnar
7a5b9a7bbe
fix: translations and route fixes
2019-12-24 17:39:15 +05:30
Don-Leopardo
ec258a43d9
perf: Asset Depreciations and Balances report ( #18022 )
2019-12-24 17:35:53 +05:30
Pranav Nachnekar
b972f763f3
fix: added validation for cost center ( #19932 )
...
* fix: add validation for cost centers in sales invoice
* use `get_cached_value` for getting compnay, formatting of error message
2019-12-24 16:46:46 +05:30
Deepesh Garg
e0b4d33039
Merge pull request #18715 from Alchez/v12-lead-address-contact
...
feat: create address and contact after lead creation (develop)
2019-12-24 16:46:05 +05:30
deepeshgarg007
d7427919a4
fix: Address section rearrange and minor bug fixes
2019-12-24 16:45:09 +05:30
Saqib
0ad7449ae3
feat: allow adding & deleting of items in submitted SO & PO ( #19911 )
...
* feat: allow adding of items after quotation submission
* feat: allow deletion of items from submitted SO & PO
* fix: case when items are added and deleted at once
* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
2019-12-24 16:42:30 +05:30
Don-Leopardo
5557b16260
fix: order_type validation restriction ( #18096 )
2019-12-24 16:39:34 +05:30
rohitwaghchaure
5c0ea2d7c9
Merge pull request #19708 from Alchez/dev-batch-to-stock-ledger
...
feat: drill down on batch transactions (develop)
2019-12-24 15:25:05 +05:30
Deepesh Garg
e633567787
Merge branch 'develop' into v12-lead-address-contact
2019-12-24 14:43:41 +05:30
Deepesh Garg
a02bb5170b
Merge pull request #19913 from nextchamp-saqib/cart-address-fix
...
fix: enable adding of address without enabling checkout feature
2019-12-24 14:08:19 +05:30
rohitwaghchaure
08433c2919
fix: supplier email id field not showing in the notification for purchase cycle doctypes ( #20071 )
2019-12-24 13:03:47 +05:30
Deepesh Garg
58408217f6
Merge pull request #19822 from Mangesh-Khairnar/edit-item-details
...
feat(marketplace): edit item details
2019-12-24 13:02:20 +05:30
Saqib
977489697d
Merge pull request #19973 from deepeshgarg007/budget_variance_dimension
...
feat: Dynamic filters for dimensions in budget variance report
2019-12-24 12:57:50 +05:30
Deepesh Garg
55bc26e300
fix: Allow creation of multiple landed cost voucher against a Purchase Document ( #20058 )
2019-12-24 12:55:01 +05:30
Himanshu
5af4c57ef7
fix: ambihious error ( #20068 )
2019-12-24 12:31:38 +05:30
Sun Howwrongbum
088be37e64
feat: consider expiry_date during Batch queries ( #20065 )
2019-12-24 12:29:25 +05:30
RJPvT
818c49279c
Update supplier_scorecard.py ( #20061 )
2019-12-24 12:24:58 +05:30
Deepesh Garg
f5bd920e8f
Merge pull request #19955 from deepeshgarg007/employee_advance_return
...
feat: Capture return amount against Employee Advance via Journal Entry
2019-12-24 11:52:20 +05:30
Deepesh Garg
cc62aad503
fix: Label for return amount
2019-12-24 11:51:39 +05:30
Rohan
ff98a52834
Merge branch 'develop' into v12-lead-address-contact
2019-12-24 11:21:08 +05:30
DeeMysterio
152c6be209
fix(employee onboarding): stop showing irrelevant job offer links for a job applicant ( #20053 )
2019-12-23 19:02:29 +05:30
Wolfram Schmidt
964cbc03ba
Update employee.json ( #20057 )
...
unnecessary description. Should be added by customer manually if needed individually.
2019-12-23 18:50:40 +05:30
Parth J. Kharwar
da5d5c4941
fix(hr): update leave application status on cancel ( #19883 )
2019-12-23 18:41:17 +05:30
Khushal Trivedi
d8c10bcedb
fix:Sibling child table filtering for duplicate entry on student form ( #19908 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix: joining and relieving Date can be on same date as valid use case
* fix-education: date of birth validation
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
2019-12-23 18:38:11 +05:30
Prssanna Desai
4f72c0b8b5
fix: wrong items in table being deleted ( #19994 )
2019-12-23 18:27:12 +05:30
Marica
93cb64ee30
enhancement`: Added Set Reserve Warehouse field in Purchase Order. ( #19991 )
2019-12-23 18:24:56 +05:30
Pranav Nachnekar
8bada8759a
fix: wrap scheduled_time
with getdate()
( #20044 )
...
* fix: wrap `scheduled_time` with `getdate()`
Handles inconsistent data returned from the ORM.
* fix: use `getdate()` instead of `date()`
2019-12-23 18:19:29 +05:30
Anurag Mishra
bd5f5dabbd
fix: Salary Structure Fixes ( #19923 )
2019-12-23 18:01:40 +05:30
Deepesh Garg
2b3482d5dd
fix: Do not validate accounting dimensions if from repost ( #20042 )
...
* fix: Do not check for accounting dimensions in case of repost
* fix: Do not validate accounting dimensions if from repost
2019-12-23 17:58:50 +05:30
Saqib
c1b6b4ed35
fix: breadcrumb for company list ( #20051 )
2019-12-23 17:28:00 +05:30
Saqib
9078607600
fix: paid amount gets overwritten by get_outstanding_invoices ( #20050 )
2019-12-23 16:25:16 +05:30
Saqib
06f9538e51
fix: bad condition while checking last asset movement entry ( #20047 )
2019-12-23 16:08:21 +05:30
Saqib
4f18d2548d
fix: none type object updates AR report row ( #19958 )
2019-12-23 16:01:38 +05:30
Saqib
1263515a92
fix: exchange rate not fetching correctly ( #20010 )
2019-12-23 15:51:31 +05:30
Anurag Mishra
e6b3da0f59
feat: fixed party and party type in Accrual journal entry ( #20021 )
2019-12-23 15:50:29 +05:30
Mangesh-Khairnar
6edd3580d1
fix(expense-claim): update status ( #20030 )
...
* fix(expense-claim): update status
* fix(expense-claim): compare using grandtotal precision
2019-12-23 15:48:34 +05:30
Deepesh Garg
06e7cf3caa
Merge pull request #20009 from nextchamp-saqib/pi-payable-filter
...
fix: bad credit to filter in purchase invoice
2019-12-23 14:50:56 +05:30
thefalconx33
ee10f2f50d
fix: bad query for debit_to field in sales invoice
2019-12-23 13:07:00 +05:30
Rucha Mahabal
0e83a5754b
fix: remove illustrations from onboarding slides ( #19872 )
...
* fix: remove illustrations from onboarding slides
* fix: change Welcome slide's description
* fix: justify text in slide
2019-12-23 08:24:46 +05:30
Deepesh Garg
704235565e
Merge pull request #20012 from nextchamp-saqib/share-transfer-perm
...
fix: no role has cancelling permission for share transfer doctype
2019-12-21 17:23:15 +05:30
Rohit Waghchaure
0dba4345f3
fix: patch
2019-12-20 17:04:39 +05:30
rohitwaghchaure
7e7cad8296
Merge pull request #20005 from 0Pranav/appointment-schedulling
...
fix: multiple issues with appointment schedulling
2019-12-20 15:16:59 +05:30
thefalconx33
7e68f050d9
fix: account manager doesn't have cancel submit perm for share transfer
2019-12-20 14:50:25 +05:30
rohitwaghchaure
0dd7e77615
Merge pull request #19928 from 0Pranav/delete-company-txn-query
...
fix: replace sql with orm query for deleting company communications
2019-12-20 13:47:34 +05:30
rohitwaghchaure
977511e814
Merge pull request #20028 from rohitwaghchaure/subcontracting_issue_for_partial_purchase_receipt_develop
...
fix: incorrect consumed qty for partial purchase receipt in subcontracting
2019-12-20 13:36:23 +05:30
rohitwaghchaure
9c1d3f2f54
Merge pull request #20024 from deepeshgarg007/gstr_2_report_fix
...
fix: Tax amount not visible for some invoices
2019-12-20 13:34:53 +05:30
Rohit Waghchaure
c2a5f99a38
fix: incorrect consumed qty for partial purchase receipt in subcontracting
2019-12-20 13:01:02 +05:30
Deepesh Garg
7043bbd19e
Merge pull request #19869 from nextchamp-saqib/website-fix
...
fix: website showing disabled items in list of products
2019-12-20 12:14:12 +05:30
Deepesh Garg
ccea0759cc
Merge pull request #20014 from marination/valuation_rate_company
...
fix: Company None not found in get_valuation_rate
2019-12-20 11:55:57 +05:30
deepeshgarg007
ad9eb9b72c
fix: Tax amount not visible for some invoices
2019-12-19 20:57:40 +05:30
Mangesh-Khairnar
c1a1e7d503
style: formatting changes
2019-12-19 20:11:37 +05:30
Gavin D'souza
1e4ea466d3
style: update/standardize rename_doc usage
2019-12-19 19:07:29 +05:30
Deepesh Garg
c408628ef2
Merge pull request #19979 from deepeshgarg007/sales_register_upgrade
...
fix: Update sales register report
2019-12-19 13:53:15 +05:30
marination
457ca0fe6c
fix: Company None not found in get_valuation_rate
2019-12-19 13:34:29 +05:30
thefalconx33
e9cb561d8d
fix: no role has cancelling permission for share transfer doctype
2019-12-19 13:18:46 +05:30
thefalconx33
9d9a78442e
fix: bad filter query
2019-12-19 13:10:57 +05:30
Deepesh Garg
57f9b758b7
Merge pull request #19983 from 0Pranav/mapped-doc-for-customer-quotation
...
fix: use open_mapped_doc instead of create_new_doc
2019-12-19 11:59:50 +05:30
deepeshgarg007
aba58ba50e
fix: Spacing after commas
2019-12-19 11:02:37 +05:30
Rohit Waghchaure
2ae79b8ac2
fix: Pricing Rule Discount for Product
2019-12-18 17:53:21 +05:30
0Pranav
e786eea7db
remove comments
2019-12-18 16:25:26 +05:30
0Pranav
5f5c725ef9
add book appointment to the sidebar
2019-12-18 16:21:50 +05:30
0Pranav
0db86204cf
fix : only set price list if it exists for customer
2019-12-18 16:03:40 +05:30
0Pranav
84ae2cc543
fix: defualt timezone not getting selected
2019-12-18 15:47:10 +05:30
0Pranav
5150c69ee6
use open_mapped_doc instead of create_new_doc
2019-12-18 12:16:49 +05:30
Anurag Mishra
1202e64403
fix: Training Event Email Tenplate ( #19652 )
2019-12-18 11:43:16 +05:30
0Pranav
e7aa20ebef
fix: replace sql query by orm in delete_communications and added tests
2019-12-18 11:16:54 +05:30
Ben Knowles
f597ba82ea
fix: task validation error when adding tasks to projects ( #19919 )
...
* fix: task validation error when adding tasks to projects
When adding a task to a project, if the project didn't have an Expected End Date the validation would fail.
This is because passing a None value to getdate() returns today's date, rather than being optional as expected.
* update task.py
2019-12-18 00:37:02 +05:30
deepeshgarg007
be8c406808
fix: Update sales register report
2019-12-17 22:27:23 +05:30
Rohit Waghchaure
4203eb4ee1
fix: not able to make work order from BOM
2019-12-17 18:19:26 +05:30
deepeshgarg007
b695fd31d6
fix: Remove trailing whitespace and add semicolon
2019-12-17 18:14:33 +05:30
deepeshgarg007
e65ada2807
feat: Dynamic filters for dimensions in budget variance report
2019-12-17 17:54:34 +05:30
rohitwaghchaure
5d0c42e2a1
Merge pull request #19943 from nextchamp-saqib/gl-precision-fix
...
fix: gl entries doesn't filter based on debit precision
2019-12-17 17:23:34 +05:30
rohitwaghchaure
3772b2e03e
Merge pull request #19962 from rohitwaghchaure/allow_overproduction_against_work_order
...
fix: now allow to over production against work order
2019-12-17 17:16:24 +05:30
rohitwaghchaure
86babbe3ac
Merge pull request #19970 from rohitwaghchaure/fixed_incorrect_outstanding_amount_showing_in_the_ap_ar_report_v13
...
fix: incorrect outstanding amount showing in the AP/AR report
2019-12-17 17:15:45 +05:30
Rohit Waghchaure
0f583b8c5a
fix: incorrect outstanding amount shwoing in the AP/AR report
2019-12-17 12:48:02 +05:30
deepeshgarg007
83ecaefd4c
feat: Custom button to create return entry from Employee Advance
2019-12-17 11:03:22 +05:30
rohitwaghchaure
741f64a51d
Merge pull request #19960 from rohitwaghchaure/fixed_incorrect_child_bom_fecthed_develop
...
fix: incorrect child boms fetched
2019-12-16 17:00:35 +05:30
Rohit Waghchaure
b5bf22a821
fix: now allow to over production against work order
2019-12-16 16:53:00 +05:30
Rohit Waghchaure
197a99ee35
fix: incorrect children boms fetched
2019-12-16 16:20:47 +05:30
rohitwaghchaure
bb75179577
Merge pull request #19957 from nextchamp-saqib/pos-serial-no-fix
...
fix: display serial no selection on adding items to cart
2019-12-16 15:11:51 +05:30
thefalconx33
f195ccd85f
fix: review changes
2019-12-16 15:04:17 +05:30
thefalconx33
e9c9cbd2fe
fix: display serial no selection on adding items to cart
2019-12-16 14:55:16 +05:30
rohitwaghchaure
b500f2ce4c
Merge pull request #19940 from marination/item_manufacturer_table_dev
...
fix: Removed 'manufacturers' table from Item Master
2019-12-16 14:44:49 +05:30
rohitwaghchaure
86b2956ac0
Merge pull request #19946 from rohitwaghchaure/pricing_rule_not_working_for_product_discount
...
fix: pricing rule not working for product discount
2019-12-16 14:44:22 +05:30
Rohit Waghchaure
8bd84b28ca
fix: schedule date
2019-12-16 12:29:07 +05:30
marination
5ab823beab
fix: Removed validation from non existent manufacturers table
2019-12-16 12:19:47 +05:30
Rohit Waghchaure
21fe97e723
fix: pricing rule not working for production discount
2019-12-16 11:15:53 +05:30
deepeshgarg007
c05bd1964f
feat: Capture return amount against Employee advance via Journal Entry
2019-12-15 21:22:28 +05:30
deepeshgarg007
b223dd95e2
fix: Dashboard for employee advance doctype
2019-12-15 21:21:31 +05:30
deepeshgarg007
40b7ac4987
fix: Minor filter fix in expense claim type
2019-12-15 21:20:55 +05:30
Deepesh Garg
b0ab31f69b
Merge pull request #19927 from surajshetty3416/fix-profit-and-loss-statement
...
fix: Profit and Lost (financial statement) report
2019-12-15 20:22:31 +05:30
rohitwaghchaure
5ed8465788
Merge pull request #19945 from nextchamp-saqib/existing-asset-fix
...
fix: remove mandatory purchase reference for existing asset
2019-12-15 16:29:30 +05:30
Suraj Shetty
ba3c9b7651
Merge branch 'develop' into fix-profit-and-loss-statement
2019-12-14 23:36:11 +05:30
Suraj Shetty
586390db81
Merge branch 'develop' into fix-profit-and-loss-statement
2019-12-14 22:49:53 +05:30
deepeshgarg007
94ff8058ac
fix: Add missing import
2019-12-14 21:25:30 +05:30
rohitwaghchaure
b2f65366cf
Merge pull request #19941 from deepeshgarg007/pricing_rule_fix
...
fix: Price rule filtering fix
2019-12-13 16:01:16 +05:30
thefalconx33
5da7e729a5
fix: remove mandatory purchase reference for existing asset
2019-12-13 15:44:39 +05:30
thefalconx33
bfc43d3b15
fix: gl entries doesn't filter based on debit precision
2019-12-13 15:41:19 +05:30
Mangesh-Khairnar
4bea44b9c9
fix: update already existing items
2019-12-13 15:05:43 +05:30
deepeshgarg007
8c9c6ec919
fix: Price rule filtering fix
2019-12-13 13:47:15 +05:30
marination
81990aee9f
fix: Removed 'manufacturers' table from Item Master
2019-12-13 13:18:59 +05:30
Deepesh Garg
57e6bcaf43
Merge pull request #19733 from marination/zero-division-basic-amount
...
fix: Division by zero error in Stock Entry
2019-12-13 09:23:44 +05:30
marination
0e33f792d3
fix: Distribute charges based on quantity if Total Basic Amount is Zero.
2019-12-12 16:34:41 +05:30
Deepesh Garg
c9870c88b6
Merge pull request #19930 from deepeshgarg007/regional_address_fix
...
fix: Get regional address details
2019-12-12 16:25:31 +05:30
Deepesh Garg
859b464a57
Merge pull request #19904 from prssanna/file-upload-fix
...
fix: Bank statement not getting attached in Bank Reconciliation
2019-12-12 15:19:54 +05:30
deepeshgarg007
c58dc873d5
fix: Get regional address details fix
2019-12-12 14:55:57 +05:30
Suraj Shetty
f95267041d
fix: Financial statement report
...
- Hidden column should note be considered in the report
- Remove hardcoded currency formatting
- Remove duplicate letterhead in the report
(print_template already adds one)
- Remove extra quotes from Total Amount text
2019-12-12 13:06:17 +05:30
Rohit Waghchaure
9b0d7b93dd
fix: not able to submit the landed cost voucher
2019-12-12 12:10:25 +05:30
Deepesh Garg
60592e9d43
Merge pull request #19897 from hrwX/qms-int-issue
...
fix: rename labels
2019-12-12 08:45:51 +05:30
Deepesh Garg
d10cefa37e
Merge pull request #19893 from marination/rounded_total
...
fix: Disable Rounded Total always showing field default value
2019-12-11 18:40:56 +05:30
Deepesh Garg
0e10340471
Merge pull request #19899 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher
...
fix: not able to cancel the landed cost voucher
2019-12-11 18:38:23 +05:30
thefalconx33
107989316c
fix: additional notes from Quotations not saved in SO
2019-12-11 18:15:54 +05:30
thefalconx33
894c210027
fix: enable address without checkout feature
...
* fix add address form country link field
2019-12-11 17:43:04 +05:30
Mangesh-Khairnar
c6599fd1e2
fix: add publihed in hub track item
2019-12-11 17:29:04 +05:30
thefalconx33
5b622eace1
fix: handle scenario with no condition
2019-12-11 16:08:31 +05:30
0Pranav
d3605d2354
fix: issue in javascript timezones
2019-12-11 15:02:23 +05:30
prssanna
2ef26fbb07
fix: empty fname and fcontent of uploaded file
2019-12-11 14:21:04 +05:30
Rohit Waghchaure
37cf096102
fix: not able to cancel the landed cost voucher
2019-12-11 13:50:29 +05:30
Himanshu Warekar
45e4b73e08
fix: rename fields
2019-12-11 13:07:41 +05:30
rohitwaghchaure
797481f9d5
Merge pull request #19802 from rohitwaghchaure/job_card_calendar_new_enhancement
...
fix: Manufacturing UX, added calendar view for job card
2019-12-11 13:01:16 +05:30
marination
ca6dbad7cb
fix: Disable Rounded Total always showing field default value
2019-12-11 12:10:05 +05:30
Raffael Meyer
9e32f587f5
fix: remove contact info, use international format ( #19828 )
...
- for international letters, city and country should be upper case: https://www.deutschepost.de/content/dam/dpag/images/B_b/Briefe_ins_Ausland/downloads/dp-brief-international-handlingbroschuere-072019.pdf#page=15
- it is not customary, to use contact information such as phone number in the address
2019-12-10 21:41:05 +05:30
Khushal Trivedi
5380a4c3db
fix-education: date of birth validation on student form ( #19875 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix: joining and relieving Date can be on same date as valid use case
* fix-education: date of birth validation
2019-12-10 21:38:42 +05:30
Anurag Mishra
9046c13858
fix: added extra condition ( #19884 )
2019-12-10 21:37:27 +05:30
Pranav Nachnekar
6aa763221b
fix: rename appointment booking route ( #19886 )
...
* rename appoinment booking route
* fix: replace all references to book-appointment route
2019-12-10 21:35:28 +05:30
rohitwaghchaure
c58495dcee
fix: Item-wise Sales History report not working ( #19889 )
2019-12-10 21:34:03 +05:30
Saqib
664d0d89b5
fix: incorrect account mapping for child companies ( #19887 )
...
* fix: incorrect account mapping for child companies on adding account to parent company
* Update account.py
2019-12-10 21:32:17 +05:30
Mangesh-Khairnar
dd079d7e02
Merge pull request #19885 from Anurag810/leave_application_dashboard_fix
...
fix: removed only custom dashboard
2019-12-10 16:24:51 +05:30
Deepesh Garg
6e2c13f4c8
feat(regional): Auto state wise taxation for GST India ( #19469 )
...
* feat(regional): Auto state wise taxation for GST India
* fix: Update gst category on addition of GSTIN
* fix: Codacy and travis fixes
* fix: Travis
* fix(test): Update GST category only if GSTIN field available
* fix: Test Cases
* fix: Do not skip accounts if place of supply is not present
* fix: Auto GST taxation for SEZ Party types
* fix: Automatic taxation for multi state
* fix: Codacy and travis fixes
* fix: Auto GST template selection in Sales Order
* fix: Move inter state check and source state to tax category
* fix: Remove unique check from tax template
* fix: Remove unique check from tax template
* fix: Address fetching logic in Sales
* fix: fecth tax template on company address change
* fix: fetch company gstin on address change
* fix: company_gstin set value fix
* fix: Mutiple fixes and code refactor
* fix: Add missing semicolon
* fix: Company address fetching in sales invoice
* fix: Remove print statement
* fix: Import functools
* fix: Naming fixes and code cleanup
* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Anurag Mishra
9cc5c18f36
fix: removed only custom dashboard
2019-12-10 15:20:47 +05:30
Deepesh Garg
ce42f48bfb
fix: Append expense account only if expense account exists ( #19880 )
2019-12-10 12:15:33 +05:30
Nabin Hait
6f68f2d020
feat: Cost center for each expenses in expense claim and allowed deferred expense ( #19807 )
...
* refactor: Expense Claim Cost Center
* refactor: Expense Claim Cost Center
* refactor: Expense Claim Cost Center
* fix: copy cost center from other row
* patch: set cost center in children based on parent
* fix: test cases for expense claim
2019-12-10 08:40:10 +05:30
marination
214acc9a42
fix: Changed check condition and added test
2019-12-09 21:38:19 +05:30
Mangesh-Khairnar
0cb2783f80
fix: create unpublish log on the hub
2019-12-09 19:24:29 +05:30
Saqib
5998034b02
fix: error message displays asset category as None ( #19873 )
...
* fix: error message displays asset category as None
* fix: asset gl_entries doesn't considers asset category's cwip account
2019-12-09 19:07:05 +05:30
Pranav Nachnekar
ae02b4119d
add init.py for appointment modules ( #19823 )
2019-12-09 19:03:35 +05:30
Nabin Hait
da4847e46d
patch: Set against_blanket_order value in existing SO/PO ( #19810 )
...
* patch: Set against_blanket_order value in existing SO/PO
* Update set_against_blanket_order_in_sales_and_purchase_order.py
2019-12-09 18:27:50 +05:30
Shivam Mishra
9e0b3b29fa
feat: better message for serial number creation ( #19863 )
2019-12-09 18:21:23 +05:30
Deepesh Garg
88c4514024
Merge pull request #19864 from nextchamp-saqib/report-col-fix
...
fix: column data not visible after manual selection of columns
2019-12-09 17:57:12 +05:30
Saqib
7e958da6d6
fix: sales order reqd only checks for stock items ( #19865 )
2019-12-09 17:23:19 +05:30
thefalconx33
2944301c87
fix: website showing disabled items in list of products
2019-12-09 16:35:54 +05:30
Mangesh-Khairnar
ba48546678
fix: display new item value
2019-12-09 16:31:14 +05:30
Mangesh-Khairnar
d249d4c947
style: change formatting
2019-12-09 15:44:31 +05:30
Mangesh-Khairnar
4350846f1e
fix(compensatory leave request): Create leave ledger entry on submit/cancel ( #19476 )
...
* fix: allow creation of leave ledger entry
* feat(compensatory-leave-request): create leave ledger entry on submit
* style: add descriptive comments
* test: allow creation of leave period based on company
* fix(leave-allocation): check name of leave allocation for determining overlap
* fix: validate new leaves allocated before updating leave allocation
* test: compensatory leave request creation
* fix: skip leave entries for non expired leave allocation
* test: creation of leave ledger entry on creation of compensatory leave request
* fix: minor changes
* fix: fetch leave approver defined in employee in leave application
* fix: attendance creation and leave balance calculation
* test: create leave period for the compensatory off
* style: add descriptive method name
* test: updation of leave allocation on submit
* fix: remove db_set from compensatory off
2019-12-09 14:27:38 +05:30
Faris Ansari
317bf5a321
feat(marketplace): Add category wise search ( #19760 )
...
feat(marketplace): change route for category wise search
2019-12-09 13:59:30 +05:30
Saqib
39e4f75a76
fix: get outstanding invoices btn working on submitted payment entry ( #19858 )
2019-12-09 13:16:35 +05:30
Deepesh Garg
babc2d1ea4
fix: Consistency in button positions in Sales Order and Purchase Order ( #19833 )
2019-12-09 13:04:44 +05:30
Deepesh Garg
b63101250c
fix: Rounding Adjustment GL entry fix ( #19838 )
...
* fix: Rounding Adjustment GL entry fix
* fix: Spacing in tab
* fix: Comment fix
2019-12-09 13:03:24 +05:30
rohitwaghchaure
d2f64214cc
Merge pull request #19853 from rohitwaghchaure/fixed_production_plan_items_required_to_pull_mr
...
fix: 'NoneType' object is not iterable
2019-12-09 12:31:06 +05:30
Deepesh Garg
da638cd476
fix: NoneType' object has no attribute '__getitem_'_ ( #19859 )
2019-12-09 11:28:31 +05:30
Deepesh Garg
3139fa2866
Merge branch 'develop' into new_invoice_fix
2019-12-07 19:54:21 +05:30
Deepesh Garg
ddc6e42b08
Merge pull request #19836 from deepeshgarg007/gst_1_validation_msg
...
fix: Validation msg fix in GSTR-1 report
2019-12-07 19:52:43 +05:30
Raffael Meyer
af9c5fda9e
rename CoA
2019-12-07 14:22:51 +01:00
Raffael Meyer
05d708b51c
add some missing accounts
...
Aktive Rechnungsabgrenzung
Passive Rechnungsabgrenzung
Kasse
Verblk. aus Lohn und Gehalt
Erlöse
2019-12-07 14:21:22 +01:00
Raffael Meyer
d86cefe1a5
first draft
2019-12-07 13:10:44 +01:00
Rohit Waghchaure
502189913a
fix: 'NoneType' object is not iterable
2019-12-07 14:10:11 +05:30
Rohit Waghchaure
6301874795
fix: timsheet overlap error
2019-12-07 13:20:37 +05:30
Rucha Mahabal
690068142b
feat: Continue Slide and New Illustrations for Onboarding Wizard ( #19813 )
...
* feat: added illustrations for onboarding
* refactor: change help label for supplier
* refactor (breaking): rename Setup Wizard slide to Onboarding Slide
* chore: code cleanup for the old doctype Setup Wizard Slide
* fix: added a 'Continue' type slide
* fix: change text in continue slide
* fix: change text for continue slide
2019-12-06 20:58:26 +05:30
deepeshgarg007
99309229bc
fix: Add missing semicolon
2019-12-06 19:59:54 +05:30
deepeshgarg007
ad53649f41
fix: Validation msg fix in GSTR-1 report
2019-12-06 19:34:49 +05:30
Rohit Waghchaure
8ab8376975
fix: Manufacturing UX, added calendar view for job card
2019-12-06 17:40:09 +05:30
Rohan
05222270e1
Merge branch 'develop' into v12-lead-address-contact
2019-12-06 14:25:30 +05:30
Rohan
5161ba787c
Merge branch 'develop' into dev-batch-to-stock-ledger
2019-12-06 14:25:00 +05:30
Rohit Waghchaure
d98ed8047a
fix: travis failing
2019-12-06 13:17:56 +05:30
Mangesh-Khairnar
015038236c
fix: update hub item document
2019-12-05 02:10:57 +05:30
Mangesh-Khairnar
6d4f4bef7e
fix(marketplace): autocomplete hub category
2019-12-05 01:01:01 +05:30
Himanshu Warekar
175d604f5f
chore: commonize function
2019-12-04 23:08:51 +05:30
rohitwaghchaure
cfbf895876
Merge pull request #19498 from marination/stock_entry_bom_fetch
...
feat: Provision to fetch items from multiple BOMs in Stock Entry
2019-12-04 21:44:47 +05:30
Himanshu Warekar
5e90ad6063
Merge branch 'develop' of https://github.com/frappe/erpnext into new_invoice_fix
2019-12-04 19:01:33 +05:30
Mangesh-Khairnar
e4274cbfa6
fix: change formatting
2019-12-04 17:51:08 +05:30
ronelvcabrera
370cdc0170
feat(Sales/Purchase Order): optional to reference a Blanket Order ( #19612 )
2019-12-04 16:07:11 +05:30
Mangesh-Khairnar
fa170e3c84
fix(marketplace): add watcher for route change to fetch new items
2019-12-04 15:59:17 +05:30
Pranav Nachnekar
114e0db419
fix: query for finding lost quotation ( #19800 )
...
* fix: query for finding lost quotation
* Update opportunity.py
2019-12-04 15:31:43 +05:30
Nabin Hait
d285e9b7bd
optimize: Optimization of Receivable report filtered based on sales person ( #19796 )
2019-12-04 15:30:58 +05:30