Nabin Hait
0f75a022f2
Minor fix in old patch
2018-01-30 15:32:17 +05:30
Nabin Hait
4eae6c985c
Fixed test records for supplier
2018-01-30 15:27:29 +05:30
Nabin Hait
b9e8b917b6
Removed ui-tests from travis
2018-01-30 15:08:33 +05:30
Achilles Rasquinha
ac57c87bc3
Fixed spacing
2018-01-30 14:05:18 +05:30
Achilles Rasquinha
244dcae110
Fixed spacing
2018-01-30 14:03:59 +05:30
Achilles Rasquinha
ef58be1302
Fixed education string
2018-01-30 13:58:43 +05:30
tundebabzy
df50a6f828
Merge pull request #12705 from achillesrasquinha/12704
...
Fix for python 3 compatibility
2018-01-30 09:26:51 +01:00
system19
4e195d97c7
Minor - Healthcare Desktop UI ( #12657 )
...
* Minor - Healthcare Desktop UI
Minor - Healthcare Desktop UI
* Update desktop.py
2018-01-30 13:48:24 +05:30
Achilles Rasquinha
2862e25f3e
fixed python3 error
2018-01-30 13:47:18 +05:30
vishdha
1910530e41
[fix] CDNR negative value
2018-01-30 12:19:56 +05:30
tundebabzy
2f4854ad1a
create new dialog everytime ( #12696 )
2018-01-30 12:18:15 +05:30
Nabin Hait
585254456e
Check credit limit while making DN, if bypassed on SO ( #12702 )
2018-01-30 12:11:22 +05:30
vishdha
109b408d11
[fix] minor changes in gst field alignment
2018-01-30 12:11:13 +05:30
vishdha
963dd1e4bc
[minor] ITC data append to row
2018-01-30 11:51:57 +05:30
rohitwaghchaure
ce5b93ca77
[Fix] Allow user to edit rate in online POS ( #12701 )
2018-01-30 10:39:46 +05:30
vishdha
e03e4a581f
[fix] Fetch correct Tax Details
2018-01-29 22:55:23 +05:30
vishdha
98e33c31cd
[wip] Gstr2
2018-01-29 22:54:38 +05:30
Cesar
d8b1927e8d
Allow no ZERO Payment
...
Allow no ZERO Payment
2018-01-29 15:39:52 +01:00
Helkyd
d6a61ad0c3
Trial Balance sort by Account Name
...
Trial Balance order by Account Name
Used Sorted under Prepare_data Function.
2018-01-29 13:47:12 +00:00
Saurabh
59c915f599
Merge branch 'master' into develop
2018-01-29 18:53:54 +05:30
Saurabh
32c2c474fd
Merge branch 'hotfix'
2018-01-29 18:53:53 +05:30
Saurabh
f3d30c5bb9
bumped to version 10.0.17
2018-01-29 19:23:53 +06:00
Saurabh
8df20f6501
Merge pull request #12695 from Zlash65/fix-dn
...
[Hotfix] Stock entry issue
2018-01-29 18:52:32 +05:30
Zlash65
f7a4d4221b
check precision with qty
2018-01-29 18:47:21 +05:30
Shreya Shah
406d449e12
fix posting date in journal entry on load ( #12694 )
2018-01-29 18:01:20 +05:30
Saurabh
d581ff40ea
Merge branch 'master' into develop
2018-01-29 17:42:37 +05:30
Saurabh
e2021252d9
Merge branch 'hotfix'
2018-01-29 17:42:37 +05:30
Saurabh
373066e0ca
bumped to version 10.0.16
2018-01-29 18:12:37 +06:00
rohitwaghchaure
52beb77539
Don't validate payment terms for POS ( #12692 )
2018-01-29 17:40:44 +05:30
Saurabh
e1e690541c
set payment term name in payment_terms ( #12693 )
2018-01-29 17:39:56 +05:30
Saurabh
61f85a8dbd
Merge pull request #12691 from frappe/codingCoffee-patch-1
...
conflict fix
2018-01-29 17:08:49 +05:30
Ameya Shenoy
471e27559f
conflict fix
2018-01-29 17:07:57 +05:30
rohitwaghchaure
86c7ede321
Merge pull request #12690 from rohitwaghchaure/subscription_sent_email_issue
...
[Fix] Subscription send notification issue
2018-01-29 17:01:00 +05:30
Rohit Waghchaure
7e033aae11
[Fix] Subscription send notification issue
2018-01-29 16:53:37 +05:30
Zarrar
5bf77beb83
precision while checking qty ( #12688 )
2018-01-29 16:47:52 +05:30
Nabin Hait
1e1b2364ab
Optimization: don't update outstanding amount while cancelling payment entry for advance adjustment ( #12689 )
2018-01-29 16:45:43 +05:30
Cesar
58c040cffb
Revert "Sort by account name"
...
This reverts commit 5cf01d9702
2018-01-29 11:57:15 +01:00
Saurabh
03f6b3e588
resolved merge conflicts
2018-01-29 16:25:33 +05:30
Saurabh
4d50fac869
Merge branch 'hotfix'
2018-01-29 16:24:55 +05:30
Saurabh
05eed01eec
bumped to version 10.0.15
2018-01-29 16:54:55 +06:00
Cesar
5cf01d9702
Sort by account name
...
Trial balance not sorted .. by adding those changes fixes the problem.
2018-01-29 11:54:12 +01:00
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date ( #12685 )
...
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date
* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +05:30
rohitwaghchaure
c385017056
Merge pull request #12638 from adityaduggal/develop
...
Resolves Issue #12630 -Added Filters to AR
2018-01-29 12:37:39 +05:30
rohitwaghchaure
d36ac27f94
Update accounts_receivable.py
2018-01-29 12:35:19 +05:30
rohitwaghchaure
62b31bf708
Update accounts_receivable.py
2018-01-29 12:34:19 +05:30
tundebabzy
c7c1defe64
after adjusting stock_qty for expired, set in_stock flag
2018-01-27 12:16:13 +01:00
tundebabzy
c14f1f145b
adjust stock_qty for expired quantities
...
adjust based on warehouse
add parameters to `get_qty_in_stock` so it can be useful in other parts of the code base
2018-01-27 12:16:13 +01:00
tundebabzy
186bea6e95
Merge pull request #12674 from tundebabzy/issue-12673-1
...
Batch List Shows Wrong Expired Status For Batches #12673
2018-01-27 07:50:12 +01:00
tundebabzy
794ecda618
corrected wrong get_diff arguments
2018-01-27 05:54:40 +01:00
tundebabzy
2d4b99917d
Merge pull request #12664 from chdecultot/fec2
...
[Hotfix] Doc file rename
2018-01-26 23:17:46 +01:00
