Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,804 Commits 3 Branches 0 Tags
Commit Graph

28804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan
a77f534f7c
Merge branch 'develop' into dev-serial-no-statuses 2019-10-16 15:08:57 +05:30
Kenneth Sequeira
c269c68727 fix: allow read-only on new address form (#19304) 2019-10-15 16:34:55 +05:30
rohitwaghchaure
3af9ea8d7d
Merge pull request #17117 from ashish-greycube/affiliate_and_coupon 
feat: affiliate sales partner referral code and coupon code
 2019-10-15 15:44:16 +05:30
Rohit Waghchaure
a20fb650fe code cleanup 2019-10-15 14:42:09 +05:30
Rohit Waghchaure
66072fec5a fixed conflicts 2019-10-15 14:18:59 +05:30
ashish-greycube
cf24191fe5 feat: affiliate sales partner referral code and coupon code 2019-10-15 11:44:45 +05:30
ashish-greycube
74dc3c99de feat: coupon_code and referral_sales_partner functionality 2019-10-15 11:44:45 +05:30
rohitwaghchaure
0bb99c15e5 fix: while submitting landed cost voucher user getting negative stock error (#19269) 2019-10-14 15:18:36 +05:30
Deepesh Garg
3f2c5c2319
Merge pull request #19288 from deepeshgarg007/analytics_chart_fix 
fix: Chart fix in Analytics report when based on item
 2019-10-13 09:33:31 +05:30
deepeshgarg007
683a89a415 fix: Chart fix in Analytics report 2019-10-12 23:02:53 +05:30
Mangesh-Khairnar
4ed9b45fb8 feat(Sales Order): Allow to skip delivery note creation (#19222) 
* feat(sales-order): add option to skip delivery note creation for order type maintenance

* fix(sales-order): hide delivery date on setting skip delivery note creation

* fix: allow skipping delivery note for all order types

* fix: bypass delivery note creation on setting skip delivery note creation

* fix: show skip delivery note in list view

* fix: check for duplicate project name after submitting prompt

* fix:  toggle delivery note reqd for skip delivery note

* fix: update status based on skip delivery note
 2019-10-12 19:33:11 +05:30
rohitwaghchaure
86870b0aa6 fix: production plan not showing grand total against sales order (#19283) 2019-10-12 16:49:38 +05:30
rohitwaghchaure
a0c162c2d6 fix: project has not set in the sub assembly work order from production plan (#19284) 2019-10-12 16:48:57 +05:30
Anurag Mishra
8e937e9640 fix: packed items child table reset on amending docs (#19157) 2019-10-11 11:50:38 +05:30
Saqib
66762380ed fixes: internal issues (#19201) 
* fix: Delivery Trip now has editable start address.

* fix: default party type not set in Journal Entry

* fix: maintainence visit purpose table not fetching item name

* fix: maintainence visit purpose table not fetching item name
 2019-10-11 11:09:10 +05:30
Mangesh-Khairnar
1d781f13b2 fix: fetch allocated amount for individual invoice (#19259) 2019-10-11 11:06:11 +05:30
Deepesh Garg
29a5756f87 fix: Allow disabled links in issue doctype (#19265) 
* fix: Allow disabled links in issue doctype

* fix: Remove unwanted attribute
 2019-10-11 11:04:48 +05:30
rohitwaghchaure
285344eb0e fix: over-bill error while making debit note against purchase return e… (#19270) 
* fix: overbill error while making debit note against purchase return entry

* Update accounts_controller.py
 2019-10-11 11:02:11 +05:30
Marica
f067447d9c fix: Margin and Discount percentage set correctly via 'Update Items' (#19276) 2019-10-11 10:47:09 +05:30
sahil28297
39d9cbc43d fix(patch): use db_insert instead of save to escape validations (#19279) 2019-10-11 10:43:50 +05:30
Deepesh Garg
2d064ee67a fix: Remove bold property from disable checkbox (#19280) 2019-10-11 10:43:38 +05:30
Himanshu
eba3a8e802 fix: get contact details (#19281) 2019-10-11 10:43:24 +05:30
Deepesh Garg
0fde204074
Merge pull request #19278 from Mangesh-Khairnar/fix-fixed-asset-register-name 
fix: change category name from in store to in location
 2019-10-11 09:14:46 +05:30
Kenneth Sequeira
a54b7542f1 fix: sales invoice labels (#19267) 2019-10-10 18:50:39 +05:30
Rohan
6c8fe5ae02
Merge branch 'develop' into dev-serial-no-statuses 2019-10-10 17:47:30 +05:30
Mangesh-Khairnar
9cf818d347 fix: change category name from in store to in location 2019-10-10 14:28:52 +05:30
Suraj Shetty
a1de447662
Merge pull request #19277 from rohitwaghchaure/not_able_to_use_webhook 
fix: name 'link_link_doctype' is not defined
 2019-10-10 14:24:04 +05:30
Suraj Shetty
a6e53410b0
Merge branch 'develop' into not_able_to_use_webhook 2019-10-10 14:22:48 +05:30
Rohit Waghchaure
4494d46020 fix: name 'link_link_doctype' is not defined 2019-10-10 14:17:06 +05:30
rohitwaghchaure
95161a0df4
Merge pull request #19266 from rohitwaghchaure/fixed_imponibileimporto_for_the_previous_row_total_develop 
fix: ImponibileImporto not getting calculated properly
 2019-10-09 18:16:26 +05:30
Marica
ccad0a4cf9 feat: Stock Quick Balance (#19123) 
* feat: Stock Quick Balance

It will display the stock balance and stock value given the date and warehouse
Item code can be fed or barcode can be scanned to retrieve the values

* fix: Codacy fixes

* fix: Renamed to Quick Stock Balance and minor fixes

Refactored code , combined functions to make it DRY
Added permissions for Stock User and Manager
Added more context to naming
 2019-10-09 15:24:58 +05:30
Rohit Waghchaure
c10064ae2c fix: ImponibileImporto not getting calculated properly 2019-10-09 13:50:16 +05:30
Faris Ansari
38ac7f7350 Enhancements to Supplier Portal (#19221) 
* fix: Add Purchase Order to portal

* fix: Create Customer or Supplier on first login

Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.

* fix: Styling for transaction_row

* fix: Styling for RFQ page

* fix: Add Purchase Invoice route

- Make Purchase Invoice from PO

* fix: minor

- Admissions for Student role
- Remove print statement
 2019-10-09 11:41:33 +05:30
Deepesh Garg
a00c98bea7
Merge pull request #19260 from Anurag810/Trends-Fixes 
fix: Query Condition On Billing date filters in Purchase invoice trends Report.
 2019-10-07 17:40:24 +05:30
Mangesh-Khairnar
3cc41634c5
Merge pull request #19161 from vijaywm/lwp_half_day_fix 
fix: LWP calculation in multi-day leaves having half day
 2019-10-07 17:05:22 +05:30
Mangesh-Khairnar
d5e9cd72df
Merge branch 'develop' into lwp_half_day_fix 2019-10-07 16:08:30 +05:30
Mangesh-Khairnar
75397b441f
style(salary-slip): fixed formatting 2019-10-07 16:08:15 +05:30
Anurag Mishra
fe5890b828 fix: Query Condition On Billing date filters 2019-10-07 14:27:07 +05:30
Deepesh Garg
817443c5dd
Merge pull request #19253 from Thunderbottom/e-invoice-disc-fix 
chore: check if discount_percentage exists
 2019-10-06 23:47:52 +05:30
rohitwaghchaure
16b8e7c432
Merge pull request #19248 from rohitwaghchaure/not_able_to_submit_work_order_v12 
fix: not able to submit the work order
 2019-10-05 23:29:44 +05:30
Chinmay D. Pai
01aca675ef
chore: check if discount_percentage exists 
fixes TypeError: '>' not supported between instances of 'NoneType' and 'float'

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-10-05 10:18:21 +05:30
Rohit Waghchaure
484e1fb218 fix: not able to submit the work order 2019-10-04 17:58:21 +05:30
sahil28297
2caf32d421 fix(patch): Reload Leave Type (#19240) 2019-10-04 16:24:53 +05:30
Saqib
d5067b4d73 chore: label changes in retail and stock (#19243) 2019-10-04 16:24:26 +05:30
Deepesh Garg
41a6548acb fix: Label and dependes on fixes in Bank Account (#19245) 2019-10-04 16:22:00 +05:30
Shivam Mishra
ba2faecdc7 fix: null check for valuation rate (#19195) 
* fix: null check for valuatiomn rate

* fix: add rate for item in test records

* refactor: use flt instead of throwing error

* Revert "fix: add rate for item in test records"

This reverts commit f8cebe65f5fe32382aba842f765d263511cbb082.
 2019-10-04 11:58:04 +05:30
Deepesh Garg
8b741cfefb
Merge pull request #19228 from Mangesh-Khairnar/fix-stock-ageing-report 
fix(stock-ageing): filter none values from the fifo queue
 2019-10-04 09:00:13 +05:30
Deepesh Garg
894604201b
Merge pull request #19242 from thefalconx33/git-issues 
fix: ‘EmployeeAdvance’ object has no attribute ‘conversion_rate’
 2019-10-03 22:39:04 +05:30
Mangesh-Khairnar
9351313186 Merge branch 'develop' of https://github.com/frappe/erpnext into fix-stock-ageing-report 2019-10-03 19:21:17 +05:30
Mangesh-Khairnar
ea70c6f696 fix: dynamically filter fifo queue 2019-10-03 19:19:42 +05:30