rohitwaghchaure
|
1545ee914a
|
Merge pull request #19432 from rohitwaghchaure/showing_untitled_name_in_item_tax_template
fix: patch, item tax template showing 'Untitled' in the name
|
2019-10-30 16:33:56 +05:30 |
|
rohitwaghchaure
|
7b6ab9738d
|
Merge pull request #19446 from rohitwaghchaure/not_able_to_select_project_in_work_order
fix: not able to select the project in the work order
|
2019-10-30 16:32:34 +05:30 |
|
Rohit Waghchaure
|
d8b64cd199
|
replaced frappe.db.sql with frappe.get_all
|
2019-10-30 16:27:58 +05:30 |
|
Rohit Waghchaure
|
2e01573a40
|
fix: item price stock report not working
|
2019-10-30 16:22:30 +05:30 |
|
Deepesh Garg
|
fac4eb919b
|
Merge pull request #19445 from scmmishra/typo-fix
fix: typo in production plan
|
2019-10-30 16:03:56 +05:30 |
|
gavin
|
e0348c9ec8
|
Merge branch 'develop' into hooks-update
|
2019-10-30 15:46:46 +05:30 |
|
Pranav Nachnekar
|
66e5e16a2e
|
Merge branch 'develop' into maintainance-ux-fix
|
2019-10-30 09:54:47 +00:00 |
|
Gavin D'souza
|
d38f5374cb
|
chore: moved email digest to long job
|
2019-10-30 14:43:58 +05:30 |
|
Mangesh-Khairnar
|
83c7b5b44b
|
fix(bom): maintain a default bom for an item (#19407)
|
2019-10-30 14:25:50 +05:30 |
|
Mangesh-Khairnar
|
7638788c2f
|
fix: calculate pending leaves (#19411)
|
2019-10-30 14:23:41 +05:30 |
|
Rohit Waghchaure
|
486a8f67a4
|
fix: not able to select the project in the work order
|
2019-10-30 14:22:49 +05:30 |
|
Anurag Mishra
|
5c9d92eabf
|
fix: On Specific case if no item code in name (#19419)
|
2019-10-30 14:18:16 +05:30 |
|
Shivam Mishra
|
afa03fd654
|
Merge branch 'develop' into typo-fix
|
2019-10-30 14:08:20 +05:30 |
|
Shivam Mishra
|
d8abac3278
|
fix: typo in production plan
|
2019-10-30 14:06:56 +05:30 |
|
0Pranav
|
c8333d4b41
|
fix: codacy
|
2019-10-30 13:48:01 +05:30 |
|
0Pranav
|
07b74533fe
|
fix: error message matches field name
|
2019-10-30 13:47:49 +05:30 |
|
Faris Ansari
|
e127d937f7
|
fix(ExpenseClaim): List filter config for Rejected and Unpaid (#19434)
|
2019-10-30 13:31:05 +05:30 |
|
0Pranav
|
da5bf5a7c4
|
fix:indentation
|
2019-10-30 11:24:58 +05:30 |
|
0Pranav
|
be5c6e7aec
|
fix:readability
|
2019-10-30 11:14:49 +05:30 |
|
0Pranav
|
0f0d6ce25c
|
Remove doctype related to appointment scheduling
|
2019-10-30 11:08:09 +05:30 |
|
Deepesh Garg
|
d0003408c4
|
Merge pull request #19438 from ahmadRagheb/patch-1
fix: getdate get imported twice
|
2019-10-30 10:58:12 +05:30 |
|
0Pranav
|
846c03889e
|
fix: hide schedule section on new forms
|
2019-10-30 10:51:25 +05:30 |
|
0Pranav
|
d2d0100c9a
|
fix:better error message when sales person is none
|
2019-10-30 10:48:13 +05:30 |
|
0Pranav
|
abbc08cb48
|
fix: hide generate schedule button on new forms
|
2019-10-30 10:46:16 +05:30 |
|
ahmadRagheb
|
2a72d1fee4
|
Update salary_slip.py
getdate imported twice
|
2019-10-29 19:49:08 +02:00 |
|
Rohit Waghchaure
|
b051fa37df
|
fix: patch, item tax template showing 'Untitled' in the name
|
2019-10-29 14:56:03 +05:30 |
|
Faris Ansari
|
bcf107b9f7
|
chore: fix unexpected keyword in shopify_settings (#19430)
chore: fix unexpected keyword in shopify_settings
|
2019-10-29 14:25:37 +05:30 |
|
Deepesh Garg
|
118f2c7d64
|
Merge pull request #19402 from Mangesh-Khairnar/fix-dn-status
fix: sync delivery note status in both list view and form view
|
2019-10-29 14:17:38 +05:30 |
|
Chinmay D. Pai
|
702f9f929b
|
chore: rename undefined variable in shopify_log
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
|
2019-10-29 13:30:13 +05:30 |
|
Chinmay D. Pai
|
4f7885f1aa
|
chore: fix unexpected keyword in shopify_settings
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
|
2019-10-29 13:20:17 +05:30 |
|
rohitwaghchaure
|
3270ba6d8c
|
Merge pull request #19421 from rohitwaghchaure/account_not_set_for_dasboard_chart_v12
fix: 'NoneType' object is not iterable
|
2019-10-29 11:30:22 +05:30 |
|
Rohan
|
8728e94dbd
|
Merge branch 'develop' into develop-company-address-label
|
2019-10-29 11:26:00 +05:30 |
|
Rohan
|
379f38e1cd
|
Merge branch 'develop' into dev-work-order-bugs
|
2019-10-29 11:25:53 +05:30 |
|
Rohan
|
fba7cae2c9
|
Merge branch 'develop' into dev-serial-no-statuses
|
2019-10-29 11:25:36 +05:30 |
|
Rohit Waghchaure
|
88d2c97391
|
fix: default accounts are not added on creation of company
|
2019-10-28 17:50:31 +05:30 |
|
Anurag Mishra
|
07b908c0c5
|
patch: Missing Patch for item Tax template
|
2019-10-28 16:00:24 +05:30 |
|
marination
|
3dbef9de74
|
fix: Search field entries included in Item Link field query
|
2019-10-28 15:48:10 +05:30 |
|
Rohit Waghchaure
|
8916916a03
|
fix: 'NoneType' object is not iterable
|
2019-10-28 13:00:18 +05:30 |
|
Deepesh Garg
|
9942fcc8cb
|
fix: Better validation msg for difference account in Stock Entry (#19400)
* fix: Better validation msg for difference account
* fix: Make primary info bold
|
2019-10-28 12:08:31 +05:30 |
|
Suraj Shetty
|
83b58352ce
|
fix: Overwrite default cost center if item has default cost center set. (#19405)
|
2019-10-28 12:05:30 +05:30 |
|
Deepesh Garg
|
a8358f0342
|
Merge pull request #19415 from frappe/jaichavan-fix-typo
fix: typo in Budget Variance Report
|
2019-10-27 18:39:23 +05:30 |
|
Deepesh Garg
|
8e7bb002e2
|
Merge pull request #19317 from frappe/revert-19265-issue_fix
refactor: Remove ignore_disabled flag from issue doctype
|
2019-10-27 18:38:53 +05:30 |
|
Shivam Mishra
|
5e14660dda
|
Merge branch 'develop' into revert-19265-issue_fix
|
2019-10-27 17:36:08 +05:30 |
|
Saurabh
|
53794a9029
|
Merge pull request #19417 from frappe/v12-pre-release
V12 pre release
|
2019-10-26 20:06:53 +05:30 |
|
Sahil Khan
|
0c0604b7ee
|
Merge branch 'v12-pre-release' into version-12
|
2019-10-26 20:02:19 +05:30 |
|
Sahil Khan
|
e6f86c934d
|
bumped to version 12.1.8
|
2019-10-26 20:22:19 +05:50 |
|
EconCode
|
07ae3abf34
|
fix: unregistering url wrong formated string
Fixed the formated string for unregistering webhooks.
String should look like:
"/admin/api/2019-04/webhooks/#{webhook_id}.json"
Taken from shopify api documentation - deleting webhooks:
https://help.shopify.com/en/api/reference/events/webhook?api[version]=2019-04#destroy-2019-04
|
2019-10-26 16:31:29 +02:00 |
|
Sahil Khan
|
970788c64e
|
Merge branch 'v12-pre-release' of https://github.com/frappe/erpnext into v12-pre-release
|
2019-10-26 19:56:31 +05:30 |
|
Sahil Khan
|
ce5200d700
|
bumped to version 12.1.7
|
2019-10-26 19:56:06 +05:30 |
|
Jai Chavan
|
9f483c1fa9
|
fix: Spelling of Variance
|
2019-10-26 18:45:01 +05:30 |
|