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 |
|
Aditya Hase
|
d7291dbcad
|
Revert "fix: Send"
This reverts commit 697f995b27.
|
2019-07-04 16:51:53 +05:30 |
|
Aditya Hase
|
697f995b27
|
fix: Send
|
2019-07-04 16:19:22 +05:30 |
|
Aditya Hase
|
95054a5a02
|
fix: Try Faster Travis
|
2019-07-04 16:14:22 +05:30 |
|
deepeshgarg007
|
a9ea49c976
|
fix: Additonal discount not get set in sales transactions
|
2019-07-04 15:56:34 +05:30 |
|
Shivam Mishra
|
e528b29eea
|
Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary
|
2019-07-04 13:46:30 +05:30 |
|
Mangesh-Khairnar
|
29734dae18
|
patch: reloads newly created docs in v12 (#18148)
|
2019-07-04 12:50:16 +05:30 |
|
Mangesh-Khairnar
|
100af0a635
|
fix(salary-slip): Nonetype error on amount calculation (#18147)
* fix: amount calculation
* Update salary_slip.py
|
2019-07-04 12:29:26 +05:30 |
|
Anurag Mishra
|
bdec7fea82
|
feat: purchase order against sales order (#17975)
* feat: purchase order against sales order
* fix: remove unwanted checks
* fix:Related tests
|
2019-07-04 12:28:01 +05:30 |
|
Nabin Hait
|
7b684a01d3
|
fix: merge conflict
|
2019-07-04 12:06:50 +05:30 |
|
Mangesh-Khairnar
|
359a73e1aa
|
fix: invoice cancellation (#18152)
|
2019-07-04 11:37:20 +05:30 |
|
rohitwaghchaure
|
ca9d13cc9b
|
Merge pull request #18135 from rohitwaghchaure/all_default_values_not_moved_to_item_default_table_develop
fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table
|
2019-07-04 00:48:57 +05:30 |
|
Deepesh Garg
|
a37c51f93e
|
Merge pull request #18149 from deepeshgarg007/trial_balance_dimensions
fix: Add filters for accounting dimensions in trial balance report
|
2019-07-03 22:00:25 +05:30 |
|
rohitwaghchaure
|
465196b0c7
|
Merge pull request #18155 from scmmishra/accounts-rec-report
fix: format values for charts
|
2019-07-03 19:26:08 +05:30 |
|