Rucha Mahabal
|
8c747ce5cf
|
merged
|
2019-07-09 15:18:45 +05:30 |
|
Rucha Mahabal
|
36963a8e04
|
feat: Email Campaign
|
2019-07-09 15:14:13 +05:30 |
|
Anurag Mishra
|
de13faf19a
|
fix: sending sms from quotation
|
2019-07-09 14:27:20 +05:30 |
|
Mangesh-Khairnar
|
6a7969117f
|
fix(bom): escape name with wildcard character (#18164)
|
2019-07-08 10:40:40 +05:30 |
|
Rushabh Mehta
|
8309fcfbbc
|
BREAKING CHANGE: Remove anti-pattern "Project Task" (#18059)
* BREAKING CHANGE: Remove anti-pattern "Project Task"
* fix(tests): remove `tasks` from project/test_records.json
* fix(tests)
* fix(test): test_employee_onboarding.py
* fix(tests): test_expense_claim.py
* fix(refactor): cleanup project.py validate/update
* fix(refactor): cleanup project.py validate/update
* fix(test): test_expense_claim
* fix(test): test_expense_claim
* fix(test): test_expense_claim, try Test Company 4
* Update project.py
|
2019-07-08 10:39:30 +05:30 |
|
Suraj Shetty
|
bef897602d
|
fix: Use db_set since it triggers on_update event (#18175)
|
2019-07-08 10:30:26 +05:30 |
|
rohitwaghchaure
|
d86f027ce0
|
fix: default supplier was not set from the patch in item defaults for multi company instance (#18178)
|
2019-07-08 10:29:26 +05:30 |
|
rohitwaghchaure
|
334335a2ef
|
fix: not able to make credit note for the sales invoice in which item code is not set (#18184)
|
2019-07-08 10:26:29 +05:30 |
|
Himanshu
|
35f15148fb
|
fix: do not update modified (#18193)
|
2019-07-08 10:25:28 +05:30 |
|
Deepesh Garg
|
f753191fdf
|
Merge pull request #18195 from deepeshgarg007/b2cs_json
fix: GSTR-1 B2CS JSON file generation and cess amount fixes
|
2019-07-08 10:10:52 +05:30 |
|
Deepesh Garg
|
6252c0490a
|
Merge pull request #18194 from deepeshgarg007/dimensions_reports
fix: Add accounting dimensions to various reports and fixes
|
2019-07-07 22:40:57 +05:30 |
|
Mangesh-Khairnar
|
afa9cae711
|
Merge pull request #17459 from rohitwaghchaure/handle_large_outstanding_invoices_code_refactored
feat(payment-entry): handle fetch operation of a large number of outstanding invoices
|
2019-07-07 22:24:27 +05:30 |
|
deepeshgarg007
|
6bb5ade667
|
fix: Add accounting dimensions to various reports and fixes
|
2019-07-07 21:24:45 +05:30 |
|
Mangesh-Khairnar
|
48d61fb072
|
Merge branch 'develop' into handle_large_outstanding_invoices_code_refactored
|
2019-07-07 20:17:07 +05:30 |
|
deepeshgarg007
|
7ce199807c
|
fix: GSTR-1 B2CS Json file generation and cess amount fixes
|
2019-07-07 14:25:08 +05:30 |
|
rohitwaghchaure
|
8a054e4b36
|
Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry
feat: provision to make debit / credit note against the stock returned entry
|
2019-07-07 00:51:46 +05:30 |
|
Bhavishya Sharma
|
607611ebdc
|
codacy fix
|
2019-07-06 15:02:57 +05:30 |
|
Bhavishya Sharma
|
db3c5625ae
|
feat: Manufacturer is Missing Contacts
|
2019-07-06 13:54:30 +05:30 |
|
rohitwaghchaure
|
94b3dd1db2
|
Merge pull request #18154 from netchampfaris/fix-price-list-on-website-d
fix: Honor price list in Shopping Cart Settings
|
2019-07-05 18:14:45 +05:30 |
|
rohitwaghchaure
|
6b2075a115
|
Merge pull request #18161 from deepeshgarg007/additional_discount
fix: Additonal discount not getting set in sales transactions
|
2019-07-05 18:13:23 +05:30 |
|
rohitwaghchaure
|
6ea1f7becf
|
Merge pull request #18177 from scmmishra/po-patch-1
refactor: added throw if supplier is not default for any item
|
2019-07-05 18:12:56 +05:30 |
|
rohitwaghchaure
|
d8196ced76
|
Merge pull request #18179 from rohitwaghchaure/income_booked_for_deferred_debit_and_credit_note_develop
fix: on credit note / debit note deferred reversed instead of income
|
2019-07-05 17:28:50 +05:30 |
|
Rohit Waghchaure
|
5d4d70b75f
|
feat: provision to make debit / credit note against the stock returned entry
|
2019-07-05 17:06:25 +05:30 |
|
Deepesh Garg
|
1640e7012b
|
Merge pull request #18172 from karthikeyan5/develop-terms-selling-buying-filter
feat(setup): adding selling buying filter in terms and conditions
|
2019-07-05 16:03:16 +05:30 |
|
Shivam Mishra
|
6277966105
|
chore: added check for auto-reorder in stock settings (#18174)
* chore: added check for auto-reorder in stock settings
* style: removed explicit return
|
2019-07-05 15:58:13 +05:30 |
|
Mangesh-Khairnar
|
ee01ba5879
|
fix: linting
|
2019-07-05 15:21:45 +05:30 |
|
Rohit Waghchaure
|
909d773462
|
fix: on credit note / debit note deferred reversed instead of income
|
2019-07-05 15:12:14 +05:30 |
|
Rohit Waghchaure
|
0f065d5de1
|
Added due date in the gl entry
|
2019-07-05 14:54:15 +05:30 |
|
Rohit Waghchaure
|
2f3f7507c4
|
fix: browser hangs while making payment entry for large number of outstaning invoices
|
2019-07-05 14:38:46 +05:30 |
|
Suraj Shetty
|
83f767b5a3
|
Merge pull request #18173 from karthikeyan5/develop-add-manufacturing-dashboards
feat(manufacturing): added dashboard for doctypes
|
2019-07-05 14:22:13 +05:30 |
|
Govind S Menokee
|
473a5477b6
|
Merge pull request #3 from kaynes-technology/develop
Merge develop
|
2019-07-05 13:33:25 +05:30 |
|
Govind S Menokee
|
f3da32db22
|
Merge pull request #2 from frappe/develop
Merge official erpnext
|
2019-07-05 13:13:10 +05:30 |
|
Shivam Mishra
|
7a7c66e95e
|
refactor: added throw if supplier is not default for any item
|
2019-07-05 13:06:53 +05:30 |
|
karthikeyan5
|
82e2bac891
|
fix(coding style): adding a few spaces
|
2019-07-05 12:41:19 +05:30 |
|
rohitwaghchaure
|
7fd503b5ba
|
Merge pull request #18176 from rohitwaghchaure/remove_item_manufacturer_from_item_master
fix: removed item manaufacturer child table from item master
|
2019-07-05 12:25:05 +05:30 |
|
Rohit Waghchaure
|
cdb75b56c5
|
fix: removed item manaufacturer child table from item master
|
2019-07-05 12:24:14 +05:30 |
|
karthikeyan5
|
ad33c19510
|
fix: converting spaces to tabs on a few lines
|
2019-07-05 11:28:59 +05:30 |
|
Shivam Mishra
|
aea2b64fd0
|
Merge branch 'develop' into remove-move-stock-summary
|
2019-07-05 10:39:27 +05:30 |
|
Shivam Mishra
|
38b930b638
|
refactor: Move and Add buttons open new stock entry
|
2019-07-05 10:38:48 +05:30 |
|
karthikeyan5
|
830f2b642b
|
chore(manufacturing): added dashboard for doctypes
|
2019-07-05 09:48:38 +05:30 |
|
karthikeyan5
|
7fc6021ca5
|
feat(setup): adding selling buying filter in terms and conditions
|
2019-07-04 22:46:16 +05:30 |
|
rohitwaghchaure
|
2f67fb25a6
|
Merge pull request #18168 from netchampfaris/stock-validation-message
fix: Add links in validation message
|
2019-07-04 19:13:08 +05:30 |
|
rohitwaghchaure
|
03db4c0efc
|
Merge pull request #18166 from netchampfaris/send-sms-bom
fix: Don't show Send SMS in BOM
|
2019-07-04 19:11:42 +05:30 |
|
rohitwaghchaure
|
c1535a5542
|
Merge pull request #18167 from netchampfaris/manufacturing-module-sections
fix(UX): Move Bill of Materials section to first
|
2019-07-04 19:11:08 +05:30 |
|
Faris Ansari
|
23c80658ba
|
fix: Add links in validation message
|
2019-07-04 18:54:04 +05:30 |
|
Faris Ansari
|
2b969a469a
|
fix: Build item cache in long worker (#18165)
|
2019-07-04 18:52:32 +05:30 |
|
Faris Ansari
|
1d3008750c
|
fix(UX): Move Bill of Materials section to first
|
2019-07-04 17:53:10 +05:30 |
|
Faris Ansari
|
a5d975d867
|
fix: Don't show Send SMS in BOM
|
2019-07-04 17:47:28 +05:30 |
|
Aditya Hase
|
31394ec9b0
|
fix: Revert unintentional commits (#18162)
fix: Revert unintentional commits
|
2019-07-04 16:53:46 +05:30 |
|
Aditya Hase
|
e5dc834ddb
|
Revert "fix: Try Faster Travis"
This reverts commit 95054a5a02.
|
2019-07-04 16:52:01 +05:30 |
|