Alexandre SPANGARO
8163739a68
LOG_WARNING on function dol_print_date with deprecated value
2019-03-28 12:03:04 +01:00
Alexandre SPANGARO
6f1b496373
Merge remote-tracking branch 'upstream/develop' into 10.0_WARNING
2019-03-28 11:57:59 +01:00
Alexandre SPANGARO
9f9dd2cd30
NEW: Add import of accounting account for intra/export selling on product card
2019-03-28 11:41:59 +01:00
atm-greg
957fae1081
missing params
2019-03-28 11:07:27 +01:00
atm-greg
11343e986c
add all missing hooks on replenish
2019-03-28 10:47:32 +01:00
Laurent Destailleur
1818e22be9
Add some font awesome icons on buttons
2019-03-28 09:56:01 +01:00
Laurent Destailleur
80f7cef0a8
Better translation
2019-03-28 09:20:05 +01:00
David Beniamine
42bd9f4c74
Fix CI again
2019-03-28 08:58:19 +01:00
David Beniamine
2834262010
Merge develop branch
2019-03-28 08:21:49 +01:00
David Beniamine
a8286eb100
Fix CI
2019-03-28 08:13:02 +01:00
Cristian Torres
64e91fa25b
[CHANGE] Making State available in .odt templates...
...
...making use of the same strategy when loading Country info from single attribute.
Previously attempted on PR #10463 which has been closed
This also relates to #7428
2019-03-27 17:09:59 -06:00
Nicolas ZABOURI
ecba09e19c
Merge remote-tracking branch 'Dolibarr/develop' into develop
2019-03-27 21:23:27 +01:00
Laurent Destailleur
c654361485
Show link to invoice at the TOP
2019-03-27 20:46:07 +01:00
Laurent Destailleur
eb1d57226f
Fix status paid after entering a payment
2019-03-27 20:28:02 +01:00
Laurent Destailleur
9105e205ff
No more need to set scroolTop, lines are sorted with last added first
2019-03-27 20:20:39 +01:00
Laurent Destailleur
ff10a2ab5a
New: show the name of place and floor on main takepos page
2019-03-27 20:13:12 +01:00
Laurent Destailleur
0dc8082179
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/takepos/takepos.php
2019-03-27 19:37:25 +01:00
Laurent Destailleur
579525ec48
New Can define nb of categories and products for pagination on TakePOS
2019-03-27 19:36:47 +01:00
Laurent Destailleur
3592283fc9
Fix Pagination of catgories and product on TakePOS
2019-03-27 19:34:13 +01:00
Laurent Destailleur
3dbcf7a0c0
Debug edit of table. Use the id instead of name.
2019-03-27 19:21:05 +01:00
Laurent Destailleur
8998e4c6a3
Fix add of a table in floor for Bar and Restaurant
2019-03-27 18:40:02 +01:00
Laurent Destailleur
ef182e4155
Show the discount on TakePOS
2019-03-27 18:15:02 +01:00
Laurent Destailleur
6e643e90cf
Translation
2019-03-27 18:00:44 +01:00
Laurent Destailleur
9d133dae12
Removed verbose log
2019-03-27 17:50:57 +01:00
Laurent Destailleur
3930464b84
Clean code and debug TakePOS module
2019-03-27 17:50:23 +01:00
Nicolas ZABOURI
c0bfdf4461
Merge remote-tracking branch 'Dolibarr/develop' into develop
2019-03-27 16:29:20 +01:00
Laurent Destailleur
9a7e6ce178
TakePOS Can enter payment in several times and with different modes
2019-03-27 16:24:44 +01:00
Laurent Destailleur
7990d7f018
Use color on the amount of the payment page of TakePOS module
...
FIX Use pricejs instead of toFixed to be compatible with all currencies
WIP Prepare to be able to enter different payment modes on same invoice
2019-03-27 16:24:44 +01:00
Laurent Destailleur
e064a954d2
Fix avoid error 500 when searching product with no criteria
2019-03-27 15:55:18 +01:00
Laurent Destailleur
11e4411400
TakePOS Can enter payment in several times and with different modes
2019-03-27 15:42:53 +01:00
ptibogxiv
22ea6fa0ab
Update api_memberstypes.class.php
2019-03-27 14:04:13 +01:00
ptibogxiv
7a84cb1fc8
Update type.php
2019-03-27 14:03:37 +01:00
Nicolas ZABOURI
7e169ae977
Merge remote-tracking branch 'Dolibarr/develop' into develop
2019-03-27 13:58:10 +01:00
Josep Lluís
3d1ebb8379
FIX filter by name_alias field on fetch
...
In fetch, when filtering by name_alias field, is used a wrong name of field (nom_alias)
2019-03-27 13:41:29 +01:00
ptibogxiv
3723da43ca
Update 9.0.0-10.0.0.sql
2019-03-27 12:50:16 +01:00
ptibogxiv
63ad6b779a
Update llx_adherent_type.sql
2019-03-27 12:49:26 +01:00
ptibogxiv
fa302db84f
Update adherent_type.class.php
2019-03-27 12:48:18 +01:00
ptibogxiv
2e9badd21d
Update api_memberstypes.class.php
2019-03-27 12:45:33 +01:00
ptibogxiv
aa28079e78
NEW morphy value in member type
...
add value: mor / phy / both(aka null)
2019-03-27 12:42:31 +01:00
Laurent Destailleur
487be34ab8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-27 12:40:47 +01:00
Laurent Destailleur
ec0733d202
Use color on the amount of the payment page of TakePOS module
...
FIX Use pricejs instead of toFixed to be compatible with all currencies
WIP Prepare to be able to enter different payment modes on same invoice
2019-03-27 12:40:32 +01:00
Christophe Battarel
00dfa86d74
Revert "memorize line before delete (for triggers)"
...
This reverts commit f45239c2a9
2019-03-27 12:09:28 +01:00
Christophe Battarel
f45239c2a9
memorize line before delete (for triggers)
2019-03-27 12:03:00 +01:00
ptibogxiv
2cc9b61a9f
Update html.form.class.php
2019-03-27 11:10:30 +01:00
ptibogxiv
2c71b98d0d
NEW automatic / manual selector form
2019-03-27 11:05:43 +01:00
Christophe Battarel
c9b321ded4
add global conf to createfromclone
2019-03-27 10:32:40 +01:00
Christophe Battarel
f1548bd253
fix objfrom
2019-03-27 10:27:08 +01:00
Christophe Battarel
9efb1b9525
copy internal and external contacts when cloning like in propal
2019-03-27 10:09:45 +01:00
Christophe Battarel
1b9cdd021a
test constant for keeping customer ref on clone of order like in propal
2019-03-27 10:00:29 +01:00
atm-greg
83d7750274
FIX missing hook completeTabsHead in margins module
2019-03-27 09:33:51 +01:00
