Laurent Destailleur
73af3542d1
FIX the feature to bill time spent was not enabled.
2019-07-19 16:18:14 +02:00
VESSILLER
b95395909c
FIX Delete a category to a contact in API
2019-07-19 16:11:44 +02:00
gauthier
cd7d3f1a36
FIX : search by phone pro
2019-07-19 15:41:44 +02:00
Laurent Destailleur
fea810fb3b
Trans
2019-07-19 13:44:30 +02:00
Laurent Destailleur
14751680d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-19 13:38:05 +02:00
Laurent Destailleur
2e08c02510
Better error management
2019-07-19 13:37:28 +02:00
Laurent Destailleur
98ae66b387
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-19 13:31:25 +02:00
Laurent Destailleur
1f308915ee
Fix trans
2019-07-19 13:23:17 +02:00
Laurent Destailleur
f745d01bf3
Prepare change of properties "titre" into "title"
2019-07-19 13:22:54 +02:00
Laurent Destailleur
cd1a2d24ee
Removed not used file
2019-07-19 13:07:07 +02:00
Laurent Destailleur
278c2d7152
Enhance the perf page
2019-07-19 12:58:21 +02:00
BadPixxel
b88d19e8e4
FIX: Units Scale Missing in Object CRUD
2019-07-19 12:24:53 +02:00
Florian Mortgat
b100cdb9db
FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set.
2019-07-19 11:58:21 +02:00
atm-ph
a03bb00254
Fix missing hook
2019-07-19 11:26:21 +02:00
jcp
f82e1f1155
Fix: Use special_code=4 for Takepos
2019-07-19 10:44:12 +02:00
Regis Houssin
7ffc46e1da
FIX When we are in update mode, so we use $this->entity
2019-07-19 09:47:05 +02:00
Regis Houssin
cbda42d146
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-07-19 09:37:34 +02:00
Laurent Destailleur
9b8b3b1ffc
Merge pull request #11527 from atm-ph/fix_9.0_missing_trigger
...
Fix missing trigger call
2019-07-19 04:06:35 +02:00
Laurent Destailleur
e5801c0b68
Update bonprelevement.class.php
2019-07-19 04:06:22 +02:00
Laurent Destailleur
fe89e158fe
Fix: Avoid deletion of system entries in dictionary
2019-07-19 04:03:33 +02:00
Laurent Destailleur
2afefada40
Fix: Avoid deletion of system entries in dictionary
2019-07-19 04:02:42 +02:00
Laurent Destailleur
efe27d335b
Fix param
2019-07-19 03:53:34 +02:00
Laurent Destailleur
5b9d9deb47
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-19 03:46:40 +02:00
Laurent Destailleur
03aa8c4b83
Better log
2019-07-19 03:29:43 +02:00
Laurent Destailleur
bb053a0064
Merge pull request #11524 from ptibogxiv/patch-197
...
ADD futur_usage stripe.class.php
2019-07-19 03:20:18 +02:00
Laurent Destailleur
8857d0acf5
Keep save_payment_method to true.
...
Keep it to true because i see no reason to not save the credit card on Stripe side.
2019-07-19 03:18:53 +02:00
Laurent Destailleur
6c3a30e872
Fix log
2019-07-19 03:05:55 +02:00
Laurent Destailleur
fc31a1182b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 18:54:50 +02:00
Laurent Destailleur
58428cefc0
Fix phpcs
2019-07-18 18:53:51 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
b9fe874b5f
Revert "Merge pull request #11022 from altatof/freetext"
...
This reverts commit 879b4d8e7f , reversing
changes made to ddc01b4c27 .
2019-07-18 18:19:51 +02:00
Laurent Destailleur
c27ac63a3a
Revert "Fix phpcs"
...
This reverts commit 03e5cc16ca .
2019-07-18 18:18:07 +02:00
Laurent Destailleur
738851441f
Revert "Fix phpcs"
...
This reverts commit dfe4debbd2 .
2019-07-18 18:18:03 +02:00
Laurent Destailleur
3cffd70ed3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
2019-07-18 18:09:37 +02:00
atm-ph
fcd95ce073
Fix missing trigger call
2019-07-18 18:07:17 +02:00
Laurent Destailleur
5e204f0f67
Merge
2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf
Merge
2019-07-18 17:50:15 +02:00
Laurent Destailleur
ad4267abfb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-18 17:47:11 +02:00
Laurent Destailleur
a09d33b427
Fix responsive
2019-07-18 17:47:00 +02:00
Laurent Destailleur
dfe4debbd2
Fix phpcs
2019-07-18 17:34:38 +02:00
Laurent Destailleur
03e5cc16ca
Fix phpcs
2019-07-18 17:33:47 +02:00
Laurent Destailleur
879b4d8e7f
Merge pull request #11022 from altatof/freetext
...
NEW : manage output languages for free text
2019-07-18 17:29:45 +02:00
Laurent Destailleur
b0baba3293
Merge pull request #11526 from atm-ph/fix_9.0_missing_hook
...
Fix missing hook then can't interact with actions
2019-07-18 17:24:08 +02:00
Laurent Destailleur
b3182f65bc
Update create.php
2019-07-18 17:23:52 +02:00
Laurent Destailleur
e548872133
Update prelevement.php
2019-07-18 17:23:05 +02:00
Laurent Destailleur
a20a121558
Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned
...
FIX: socpeople assigned list in action com list
2019-07-18 17:20:41 +02:00
Laurent Destailleur
747305fcc6
Merge pull request #11521 from altatof/jsonprices10
...
FIX : do not return formatted prices in json string
2019-07-18 17:18:13 +02:00
Laurent Destailleur
d04a092756
Merge pull request #11525 from altatof/fournpricelog
...
FIX fournrprice log for insert
2019-07-18 17:16:04 +02:00
Laurent Destailleur
f53f314211
Update fournisseur.product.class.php
2019-07-18 17:15:50 +02:00
Florian Mortgat
dbd68027f8
New script that links "orphaned" dispatch lines to order lines
...
(the "orphans" are dispatch lines that were created in old versions of Dolibarr which didn’t have fk_commandefourndet in llx_commande_fournisseur_dispatch)
2019-07-18 17:03:16 +02:00