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

2374 Commits

Author SHA1 Message Date
Mangesh-Khairnar
24248f687b patch: create entries for only missing transactions 2019-05-27 10:58:42 +05:30
Mangesh-Khairnar
f3926d0fcb patch: leave ledger entries 2019-05-26 20:17:16 +05:30
Himanshu Warekar
f38486b22c Merge develop into sla_fix 2019-05-20 23:25:26 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report (#17524) 
feat(regional): Bank remittance report
 2019-05-20 15:00:48 +05:30
Mangesh-Khairnar
57c861efc3 feat: add patch to create custom fields for india specific client 2019-05-20 13:08:18 +05:30
Himanshu Warekar
628ea47c6d Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-17 00:48:23 +05:30
Saurabh
9da57d79b5 fix: reload docs before creating custom fields (#17586) 2019-05-15 11:39:41 +05:30
Shivam Mishra
374999b048
feat: Password protected salary slips (#17380) 
* feat: Added check for encrypting salary slips and password policy field

* feat: make password policy mandatory if encrypt option is selected

* feat: added password logic to email_salary_slip

* fix: import error

* chore: Minor enhancement to validations in salary slip

* fix: travis patch

* feat: Modified email body for password protected salary slips
 2019-05-08 17:30:08 +05:30
Himanshu Warekar
c5999154e6 fix: test cases and use orm 2019-05-06 23:43:16 +05:30
Himanshu Warekar
9faaa17d9d patch: fixes 2019-05-05 23:55:17 +05:30
Himanshu Warekar
f8b9c849a1 fix: test cases for sla 2019-05-05 22:51:18 +05:30
Himanshu Warekar
fbb7ea4856 fix: patch fix 2019-05-05 17:21:38 +05:30
Himanshu Warekar
134ad61604 fix: patch fixes 2019-05-05 16:26:11 +05:30
Himanshu Warekar
917e534191 patch: fix to migrate to new sla structure 2019-05-05 14:43:11 +05:30
Himanshu Warekar
e9b159c500 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-05 12:45:50 +05:30
Himanshu Warekar
ec54e3d831 patch: migrate to new sla structure 2019-05-05 12:31:04 +05:30
Himanshu
ac1ce5d205 fix: Remove Scheduling Tool if exists (#17473) 
* fix: scheduling tool

* fix: patch for scheduling tool

* fix: remve drop table
 2019-05-04 22:43:37 +05:30
Karthikeyan S
6b77f6edf3 fix: woocommerce settings patch (#17422) 
(cherry picked from commit 7df8c0ef82d72920aba342623dc10c5c14b1d8f8)
 2019-05-01 09:07:44 +05:30
Nabin Hait
8784b0b134
Update move_item_tax_to_item_tax_template.py 2019-04-25 10:40:34 +05:30
Nabin Hait
2cb57dc3e7
Update move_item_tax_to_item_tax_template.py 2019-04-24 23:34:04 +05:30
Nabin Hait
553a3ea7d2 fix: create account if not exists in item tax patch 2019-04-23 18:46:17 +05:30
Nabin Hait
d3cd98c45e fix: Renamed depends_on_lwp to depends_on_payment_days 2019-04-22 13:45:45 +05:30
Nabin Hait
36561801c2 Update set_salary_details_submitable.py 2019-04-22 13:38:06 +05:30
Anurag Mishra
35e52b5596 fix: fixed spelling 2019-04-22 13:37:03 +05:30
karthikeyan5
13563dc495 fix(woocommerce integration): fix strange travis error 
the patch was working locally. But, in was failing on travis. The strange thing was that the patch running in travis was looking for woocommerce_settings in the path 'frappe.core.doctype.woocommerce_settings.woocommerce_settings'

(cherry picked from commit df3e8853aeedb4991e7f8b1c878adb7ba849a063)
 2019-04-15 19:47:13 +05:30
karthikeyan5
63f8cda069 fix(woocommerce integration): possible travis fix 
possible fix for travis patch error "Error: No module named woocommerce_settings.woocommerce_settings)"

(cherry picked from commit a0b7ff60b8c3303a405c98eac11e71cd556ba166)
 2019-04-15 19:47:13 +05:30
karthikeyan5
307e6a8825 fix(woocommerce integration): defaults in settings 
(cherry picked from commit f788117b3ea9be83c54e169a1535ded0722f229c)
 2019-04-15 19:47:02 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Nabin Hait
398e4b9472 fix: Ignore item tax patch if old schema does not exists 2019-04-05 16:41:17 +05:30
Nabin Hait
a3357e4e86 fix: Default variant Based on 2019-04-05 12:10:36 +05:30
Saurabh
84a18f5b18 Merge branch 'master' into develop 2019-03-28 13:54:34 +05:30
Rohit Waghchaure
1b7059b867 fix: ImponibileImporto calculation 2019-03-27 15:33:47 +05:30
Rohit Waghchaure
22ebaf1b11 fix: added tags for discount amount, multiple customer po no, delivery notes 2019-03-26 20:19:46 +05:30
Rohit Waghchaure
5816fc2801 Renamed subcontract to Send to Subcontractor 2019-03-26 12:52:49 +05:30
Rohit Waghchaure
ffbeb02428 renamed purpose in stock entry 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
c7b916ac46 fix: test cases 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
8ce2d50706 Added test cases 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
186c758087 feat: added good in transit feature in the stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
1f2f9cf360 feat: added stock entry type master to select purpose in the stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
327c194144 Added hsn code field in the stock entry item table 2019-03-26 12:52:08 +05:30
Rohit Waghchaure
4ae221946b renamed report 2019-03-26 11:14:06 +05:30
Rohit Waghchaure
1c1d0bb1c7 feat: commonified item group wise target variance report 2019-03-25 17:56:43 +05:30
Rohit Waghchaure
4792a84b5f fix: rename pricing rule child doctype names 2019-03-25 14:28:08 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Rushabh Mehta
2537b7fce8
Merge branch 'develop' into hotfix-work-order-item-name 2019-03-22 12:48:56 +05:30
Rushabh Mehta
7678c7b179
Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt 
fix: purchase receipt not able to submit because default inventory account has not selected in another company
 2019-03-22 12:47:06 +05:30
Deepesh Garg
22b61607c6 feat: GSTR3B Report JSON creation and Print Format (#16595) 
* feat: Created doctype for GSTR3B report and added boilerplate code

* feat: Updated gst_fields and patches for gst_category

* feat: Functions for calculating itc amount

* fix: Patched eligibility_for_itc_field

* fix: Updated set_category for gst

* fix: Function for setting iter_state supplies

* fix: Changed route to regional module, minor fix in inster_state_supply grouping and fixes in print format

* fix(style): Added missing semicolon and removed unused imports

* fix: Patch field only if column is available

* fix: Make custom fields only for india sepecific company

* fix: Add intro to gstr3b report

* fix: Updated patch in patches.txt

* fix: Update patches.txt

* fix: Update patch to set GST Category

* fix: Add fields for nil rated and non gst in item master

* fix: Added logic for nil rated and non gst inward flow

* fix: Initial test case for GSTR3B Report

* fix: Codacy fixes

* fix: Test Case fixes

* fix: Add link for gstr_3b_report in accounting module

* fix: Updated report template

* fix: Changes in GSTR3B Report doctype

* fix: Added function to get missing field invoices

* fix: Added more test cases

* fix: Item not found error in test case

* fix: Key error in state numbers

* fix: Changes in GSTR3b Doctype

* fix: Changed functions to method

* fix: Minor fix in patch

* fix: Add gst_ctegory in GST Reports

* fix: Minor fixes in patch and itc_mapping

* fix: Query to patch itc field

* fix: Patch registered customers and fix for multiple gst accounts

* fix: Test case

* fix: Total taxable calculation logic fix and template enhancement

* fix: Calculate txval seperately

* fix: itc amount calculation fix and patch improvement

* fix: Updated test_cases for itc calculation

* fix: Missing field query

* fix: Multiple minor fixes inreport

* fix: Added transalations in GSTR3B-Form

* fix: Use double underscore for translation

* fix: GST fields ordering fix

* fix: Print form precision fix and get_period function fix
 2019-03-21 20:47:47 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965) 
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
 2019-03-19 11:48:32 +05:30
Rushabh Mehta
f060831cce fix(escaping): make_italian_localization_fields.py 2019-03-18 18:04:34 +05:30
rohitwaghchaure
ef74e94374
Merge pull request #16882 from rohitwaghchaure/multiple_time_logs_in_job_card 
feat: child table to add multiple time logs in job card
 2019-03-15 11:46:33 +05:30
Rohan Bansal
6cbd3998fb fix(work_order): Use single update query 2019-03-12 12:15:37 +05:30
Rohan Bansal
b4745ec668 fix(work_order): Change Work Order title to show item name instead of item code 2019-03-12 12:13:02 +05:30
Rohit Waghchaure
52729bf369 feat: child table to add multiple time logs in job card 2019-03-11 00:02:32 +05:30
Frappe Bot
7e67a400cd Merge branch 'master' into develop 2019-03-08 09:39:33 +00:00
Rohit Waghchaure
6b33c9b934 fix: purchase receipt not able to submit because default inventory account has not selected in another company 2019-03-08 11:13:35 +05:30
Nabin Hait
9ec4816b32
Update item_barcode_childtable_migrate.py 2019-03-08 10:44:13 +05:30
Rushabh Mehta
703a597478 fix(patch): update customization options if completed is not present 2019-03-07 13:03:40 +05:30
Frappe Bot
1fcae10258 Merge branch 'master' into develop 2019-02-28 10:20:48 +00:00
Rohit Waghchaure
74cfe57716 fix: e-invoicing patch, patch to set country code in the address 2019-02-27 14:38:36 +05:30
Rushabh Mehta
02a9ec33ed BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk 2019-02-26 14:30:38 +05:30
Saurabh
482ebd2c7c Merge branch 'master' into develop 2019-02-20 18:14:18 +05:30
Saurabh
9fcfc63f77 fix: reload report doc and indentation fixes 2019-02-20 17:04:18 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
Gaurav
3f046136d4 fix(regional,italy): added state code on address, updated patch 
moved state codes to init, rewired patch
added logic to autoset state code on address validate
handled multiple names for Italy
refactored validate_address_italy to validate_address
 2019-02-19 17:28:36 +05:30
Nabin Hait
8e9d947527
Merge branch 'hotfix' into fix-item-variant-settings-barcodes 2019-02-19 15:07:46 +05:30
Gaurav
f1e28e0e8d mod(regional,italy): Updates to Italian Localization 
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
 2019-02-19 10:39:22 +05:30
Suraj Shetty
053d6a2ca1 Move reload doc before get query 2019-02-17 11:24:51 +05:30
Suraj Shetty
3a2f342ac1 Ignore duplicate entry 2019-02-16 21:09:24 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Nabin Hait
a0c9c7501b
Update update_total_qty_field.py 2019-02-15 14:24:08 +05:30
Nabin Hait
6f7a4d94ce fix: Consider parenttype while updating total qty in transactions 2019-02-14 19:34:43 +05:30
Faris Ansari
a748ca69e7 fix: Validate invalid fields in Item Variant Settings 
- Some fields like barcodes cannot be copied in Item Variants
- Wrote a patch that deletes the fields if they exist
- Also, validate in controller
 2019-02-13 13:02:39 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
sahil28297
1a7e438fb2 fix(pstch): allow duplicate entries (#16632) 2019-02-11 15:53:04 +05:30
Prateeksha Singh
ce27cffaad refactor(desk_icon): Remove reference and patches to Desktop Icon 2019-02-07 09:58:21 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-02-01 19:17:04 +05:00
Nabin Hait
e1c75a9d55 fix: fixed salary structure assignment patch (#16546) 
* fix: fixed salary structure assignment patch

* fix: patch
 2019-02-01 12:25:40 +05:30
Sagar Vora
7a1c40c7c1 Merge branch 'master' into develop 2019-01-30 20:09:45 +05:30
Saurabh
429996752d fix: patch fixes (#16524) 2019-01-30 17:45:48 +05:30
Saurabh
a342138625 Merge branch 'master' into develop 2019-01-30 12:38:58 +05:30
Saurabh
5c12490709 fix: patch to add guardian role if not exists 2019-01-30 11:52:53 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Sagar Vora
f3cfad7595 Merge branch 'master' into staging-fixes 2019-01-29 17:20:46 +05:30
Nabin Hait
1467962f8a
Merge pull request #16490 from nabinhait/gst_settings_perm 
GST Settings permission and regional taxes creation
 2019-01-29 11:27:18 +05:30
Saif Ur Rehman
392d019bd0 fix(Item Tax Patch): Converted global variables to local 2019-01-25 15:09:43 +05:00
Saif Ur Rehman
3d275af67b Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
 2019-01-24 23:40:16 +05:00
Nabin Hait
49b41e49ae fix: Added permissions in GST Settings and added filters for accounts based on company 2019-01-24 17:55:44 +05:30
Suraj Shetty
41b3756df5 fix: patch to replace Project icon with Projects icon (#16374) 
* Delete duplicate projects icon from desktop.py

* Fix patch (to replace project to projects)
 2019-01-24 10:57:05 +05:30
Sagar Vora
e9778d9556 fix: do not use built-in "input", reload_doc 2019-01-23 17:13:31 +05:30
Sagar Vora
f51661b225 fix: allow operators, make weighting_function mandatory 2019-01-23 16:42:28 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Saif Ur Rehman
74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
 2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Saif Ur Rehman
398f593e5f Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-01-18 17:33:19 +05:00
Rohit Waghchaure
7e71e132a3 Added patch 2019-01-18 11:47:31 +05:30
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Saurabh
68ea608ca8 fix: import unicode_literals 2019-01-15 14:47:32 +05:30
Himanshu
cccc78e197 fix: Qms icon color and label fix (#16293) 
* qms color fix according to palette

* changed qms icon and color

* patch to change icon

* fix no module named v12_0

* removed spacing in desktop icon

* fix: line break

* renamed QM to Quality

* patch to rename quality management to quality

* resolve merge conflicts
 2019-01-14 14:36:54 +05:30
Saif Ur Rehman
fc5c9b8ab8 chore: Move Item Tax Template patch to v12 2019-01-10 04:34:14 +05:00
Saif Ur Rehman
8d61794540 Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json
 2019-01-10 04:23:40 +05:00
Saif Ur Rehman
eb7277d2d4 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template 
# Conflicts:
#	erpnext/patches.txt
 2019-01-09 11:25:53 +05:00
Saif Ur Rehman
848bbac05e Added patch for Item Tax Template 2019-01-07 05:32:38 +05:00
Suraj Shetty
c349ae26b9 Add patch to rename additional salary component 
- Should fix https://pastebin.com/xsNHPAh6
(happens when clicking links option in menu of Employee master)
 2019-01-02 09:31:11 +05:30
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
rohitwaghchaure
56c5d8b784
Merge pull request #16286 from rohitwaghchaure/fixed_patch_rename_bom_wo_fields 
[Fix] Patch rename_bom_wo_fields
 2018-12-26 16:26:19 +05:30
Rohit Waghchaure
8406720a7a [Fix] Patch rename_bom_wo_fields 2018-12-26 16:25:44 +05:30
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes 
Fix user permission checks
 2018-12-26 14:49:01 +05:30
Suraj Shetty
19f8e6bcf8 Fix typo 2018-12-25 15:30:09 +05:30
Suraj Shetty
488aa86f70 Skip some codacy warnings 2018-12-25 14:46:44 +05:30
Suraj Shetty
8d9960bdad Fix patch entry 2018-12-25 12:33:37 +05:30
Suraj Shetty
bcd8f31e43 Add an entry of a patch in patches.txt 2018-12-25 11:16:49 +05:30
Suraj Shetty
a3f28d40b0 Remove _label 2018-12-24 19:39:45 +05:30
Suraj Shetty
9c3dcfea76 Add a patch to rename accounts desktop icon to accounting 2018-12-24 17:00:40 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
rohitwaghchaure
4265c5a772 Rename BOM and Work order fields (#16209) 
* Rename BOM and Work order fields

* Rearranged BOM fields
 2018-12-24 14:38:49 +05:30
Suraj Shetty
b58c317abb Fix daily_work_summary_settings migration patch 2018-12-24 10:26:39 +05:30
Suraj Shetty
27c37e1b77 Minor fix 2018-12-21 12:43:46 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
Suraj Shetty
89625b6eef Rename learn to help 2018-12-21 11:04:32 +05:30
Suraj Shetty
b0a84f014e Replace desktop icon for project list with desktop icon for projects module 
- Add a patch to fix already install instances
 2018-12-20 20:12:37 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes 2018-12-18 15:41:03 +05:30
Faris Ansari
4994d84565 fix(pos-profile): Cleanup Form for POS Profile (#16208) 
- Remove pos_profile_name field and use `name` as Prompt
- Reorganize form and label sections
- Remove `apply_discount` which was not used
 2018-12-14 14:19:14 +05:30
Frappe Bot
8e1326f22f Merge branch 'staging' into develop 2018-12-10 16:05:45 +00:00
Rohan
c1eb94d37f Revert "fix(delivery): update package total on validate (#16131)" 
This reverts commit f43433b43d.
 2018-12-10 20:27:14 +05:30
Suraj Shetty
07e5786e1b Fix user permission checks 2018-12-10 19:10:18 +05:30
Frappe Bot
5b50b2848d Merge branch 'staging' into develop 2018-12-10 13:08:33 +00:00
Rohan
f43433b43d fix(delivery): update package total on validate (#16131) 2018-12-10 17:47:31 +05:30
Frappe Bot
7c2a5bddb1 Merge branch 'staging' into develop 2018-12-06 09:50:25 +00:00
Ranjith
5d2e52c4ef fix: healthcare patch 2018-11-19 20:03:25 +05:30
Frappe Bot
8c7373dfd0 Merge branch 'staging' into develop 2018-11-15 09:45:05 +00:00
Frappe Bot
eb4969d24f Merge branch 'staging' into develop 2018-11-15 09:26:03 +00:00
Nabin Hait
a0a2f58a21
Merge pull request #15985 from adityahase/perf-patch 
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
 2018-11-15 14:50:58 +05:30
Rohit Waghchaure
43920530a1 [Minor] Patch fixes 2018-11-15 12:20:27 +05:30
Aditya Hase
d168a71cfb perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE 
update_total_qty_field patch was using UPDATE statement with CASE

Now use INSERT INTO with ON DUPLICATE KEY UPDATE clause which
allows this query to use indexes and update multiple rows per query.
 2018-11-14 19:09:07 +05:30
Frappe Bot
98a2348779 Merge branch 'staging' into develop 2018-11-14 11:33:08 +00:00
Nabin Hait
d34bfa8c2c fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes 2018-11-13 18:21:22 +05:30
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
Frappe Bot
88c88d6e7c Merge branch 'master' into staging-fixes 2018-11-13 10:59:05 +00:00
Alchez
ce3340903d Update Delivery Trip status based on visited stops (#15723) 
* feat(delivery_trip_status): Update Delivery Trip status based on visited stops

* feat(delivery_trip_status): Fix tests

* feat(delivery_trip_status): Fix allow on submit for status

* feat(delivery_trip_status): Change status mapping

* feat(delivery_trip_status): Fix patch

* Update update_delivery_trip_status.py
 2018-11-13 12:22:17 +05:30
khushalti
fad08e1bcb [fix] - GL entry not creating on PR if rejected qty mentoned (#15815) 2018-11-13 12:09:32 +05:30
Ameya Shenoy
ea42980de6
Merge branch 'staging' into develop 2018-11-06 11:17:24 +00:00
Rohit Waghchaure
56bf39bfea [Fix] Patch 2018-11-06 16:32:29 +05:30
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop 2018-10-17 09:44:39 +00:00
deepeshgarg007
0cbb9b54fa Deprecating subscriber doctype (#15695) 
* Depricating subscriber doctype

* Removed naming series
 2018-10-16 14:39:16 +05:30
Ameya Shenoy
606c504f28
Merge branch 'staging' into develop 2018-10-15 12:25:03 +00:00
Ameya Shenoy
4fa58359c8
Merge pull request #15689 from codingCoffee/pat 
fix(patch): reload patient
 2018-10-15 17:49:42 +05:30