rohitwaghchaure
|
56e31d05e9
|
[Fix] POS customer field is hang while searching customer, make error log if sync has failed (#10607)
|
2017-08-31 14:19:58 +05:30 |
|
krnkris
|
3c635e219e
|
Rename fr_plan_comptable_général.json to fr_plan_comptable_general.json (#10601)
|
2017-08-31 14:17:46 +05:30 |
|
Makarand Bauskar
|
de278635a3
|
[hotfix] fixes for UnicodeDecodeError (#10620)
|
2017-08-31 13:36:56 +05:30 |
|
mbauskar
|
5096c45dec
|
Merge branch 'master' into hotfix
|
2017-08-29 20:42:06 +05:30 |
|
Faris Ansari
|
847f9f80c1
|
Merge pull request #10559 from mntechnique/pos_scanner_hotfix
[Fix] POS Scanner
|
2017-08-28 16:54:01 +05:30 |
|
Faris Ansari
|
8fbc08f91f
|
Decrease timeout to 400
|
2017-08-28 16:52:20 +05:30 |
|
mbauskar
|
5d0c4361ab
|
resolved merged conflicts
|
2017-08-28 11:58:44 +05:30 |
|
Nabin Hait
|
2df0788c11
|
Validate for negative outstanding reference only if party is Customer or Supplier (#10568)
|
2017-08-28 11:23:33 +05:30 |
|
Revant Nandgaonkar
|
2558daf6b7
|
Allow search without keypress enter
|
2017-08-26 15:52:35 +05:30 |
|
Revant Nandgaonkar
|
2f7cb82ca0
|
[Fix] POS Scanner
Search item based on key press instead of 1sec wait
Fast Scanning needs this to avoid 1sec delay
|
2017-08-26 09:58:15 +05:30 |
|
Nabin Hait
|
caab582943
|
Tax breakup for actual amount and fixes in itemised purchase register (#10515)
* Tax breakup for actual amount and fixes in itemised pur register
* Rounding of itemised tax breakup amount
|
2017-08-24 16:22:28 +05:30 |
|
mbauskar
|
06f5ae0e78
|
Merge branch 'master' into develop
|
2017-08-23 13:06:43 +05:30 |
|
Saurabh
|
b903c86076
|
Merge pull request #10506 from nabinhait/hotfix677
Minor fix in itemised sales register
|
2017-08-23 11:13:31 +05:30 |
|
Nabin Hait
|
fcb2462902
|
Minor fix in itemised sales register
|
2017-08-23 09:44:33 +05:30 |
|
Nabin Hait
|
bb326f2bbd
|
Chart of accounts for Taiwan (#10435)
|
2017-08-22 19:07:42 +05:30 |
|
Nabin Hait
|
382f5eb1b1
|
Run sales/purchase register for one month by default (#10493)
|
2017-08-22 19:06:21 +05:30 |
|
Vishal Dhayagude
|
a1637d8343
|
[UI Test] UI test for Sales Invoice with Payment Entry (#10483)
* [UI Test] UI test for Sales Invoice with Payment Entry
* Update test_purchase_order_receipt.js
|
2017-08-22 18:33:17 +05:30 |
|
mbauskar
|
4396a0e9a8
|
Merge branch 'master' into staging
|
2017-08-22 15:42:10 +05:30 |
|
mbauskar
|
3b3ab4d574
|
Merge branch 'master' into develop
|
2017-08-22 15:42:10 +05:30 |
|
Nabin Hait
|
28d8557905
|
[fix] Taxes in itemised purchase register (#10494)
|
2017-08-22 15:30:45 +05:30 |
|
mbauskar
|
7716a08b5d
|
Merge branch 'master' into staging
|
2017-08-22 12:03:47 +05:30 |
|
mbauskar
|
7d9452f4e4
|
Merge branch 'master' into develop
|
2017-08-22 12:03:47 +05:30 |
|
Makarand Bauskar
|
11224eaf06
|
[hotfix] fixes for TypeError: 'NoneType' object is not iterable (#10484)
|
2017-08-22 12:03:02 +05:30 |
|
Rohit Waghchaure
|
33326fe90e
|
[Fix] Pricing rule applying only on item groups defined in POS profile
|
2017-08-21 16:30:21 +05:30 |
|
mbauskar
|
5088ad11ee
|
Merge branch 'master' into staging
|
2017-08-21 08:58:52 +05:30 |
|
mbauskar
|
62f0722325
|
resolved merge conflicts
|
2017-08-21 08:58:42 +05:30 |
|
Nabin Hait
|
879e162cce
|
Additional GST related fields in Invoice and Sales/Purchase Register reort (#10405)
|
2017-08-21 08:28:55 +05:30 |
|
Nabin Hait
|
1f49f511aa
|
Tax rate in Itemised sales/purchase register and cleanups (#10439)
|
2017-08-21 08:05:12 +05:30 |
|
rohitwaghchaure
|
6b1624cfee
|
[Fix] Tax rule is not working for the parent customer groups (#10458)
|
2017-08-21 07:38:37 +05:30 |
|
Vishal Dhayagude
|
8fd5b325e0
|
[UI Test] travis.yml modified for fresh UI Test (#10446)
* [UI Test] travis.yml modified for fresh UI Test
* [fix] travis
* Update test_production_order.js
* Update test_production_order.js
* Update test_purchase_order_receipt.js
* Update tests.txt
* Update test_purchase_order_receipt.js
|
2017-08-20 10:59:48 +05:30 |
|
rohitwaghchaure
|
fff56530c4
|
[Fix] Due date not fetching on the payment entry against the invoices (#10419)
|
2017-08-17 14:47:25 +05:30 |
|
Vishal Dhayagude
|
f37eacdee5
|
[UI Test] Purchase Invoice (#10422)
* [UI Test] Purchase Invoice
* [fix] Travis failed
|
2017-08-17 11:01:59 +05:30 |
|
Nabin Hait
|
64c32dcd59
|
[fix] Update monthly sales value on Company (#10417)
* [fix] Update monthly sales value on cancellation of invoice, also update modified datestamp
* Company monthly sales: patches and test cases
|
2017-08-16 15:04:18 +05:30 |
|
mbauskar
|
40377e87de
|
Merge branch 'master' into staging
|
2017-08-14 12:33:56 +05:30 |
|
Makarand Bauskar
|
e5ae4d3bd3
|
send email via the background jobs (#10374) (#10393)
* send the email via the background worker in the payment request (#10350)
* send email via the background jobs (#10374)
|
2017-08-14 12:22:50 +05:30 |
|
Vishal Dhayagude
|
7186131d65
|
[UI Test] sales invoice (#10394)
* [UI Test] Sales Invoice
* [UI Test] Sales Invoice
|
2017-08-14 12:22:04 +05:30 |
|
mbauskar
|
f03afe0878
|
Merge branch 'master' into staging
|
2017-08-14 09:31:01 +05:30 |
|
mbauskar
|
2fa8af3b02
|
Merge branch 'master' into develop
|
2017-08-14 09:31:01 +05:30 |
|
Faris Ansari
|
7273cb7f54
|
Track changes in Account doctype (#10373)
|
2017-08-11 16:19:28 +05:30 |
|
Manas Solanki
|
e97f587411
|
send the email via the background worker in the payment request (#10350)
|
2017-08-10 11:17:38 +05:30 |
|
rohitwaghchaure
|
5999ade43a
|
[Fix] Auto batch creation not working for purchase invoice is update stock is enabled (#10348)
|
2017-08-09 17:24:13 +05:30 |
|
Nabin Hait
|
7f476b4528
|
The series added for Asset Depreciation Entry (#10268)
|
2017-08-08 15:01:02 +05:30 |
|
Nabin Hait
|
32992d555d
|
Added chart of accounts for Argentina, France, Brazil and Hungary (#10312)
|
2017-08-08 14:42:04 +05:30 |
|
mbauskar
|
1065679720
|
Merge branch 'master' into staging
|
2017-08-08 12:54:12 +05:30 |
|
mbauskar
|
6b0b7912c4
|
Merge branch 'master' into develop
|
2017-08-08 12:54:12 +05:30 |
|
Saurabh
|
3a4b6c2cba
|
[fix] redirect to payment url if paying via web portal (#10265)
* [fix] redirect to payment url if paying via web portal
* [fix] test case fix
* [fix] test case fixes
|
2017-08-08 11:29:11 +05:30 |
|
rohitwaghchaure
|
9ef1d0f5a5
|
[Fix] Balance sheet not working (#10311)
|
2017-08-08 11:23:25 +05:30 |
|
Nabin Hait
|
19128134a8
|
Merge pull request #10295 from tundebabzy/issue-10099-2
BOM Currency symbol issue (#10099) - Stock Ledger report
|
2017-08-07 13:49:22 +05:30 |
|
Nabin Hait
|
51b4167cdd
|
Merge pull request #10269 from tundebabzy/currency-issues
BOM - Currency symbol issue (#10099)
|
2017-08-04 15:36:35 +05:30 |
|
mbauskar
|
4ef1e2046b
|
Merge branch 'master' into staging
|
2017-08-04 14:08:57 +05:30 |
|