lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,109 Commits 43 Branches 150 Tags 886 MiB
9165ea9e67
Commit Graph

89109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Mortgat
e404069d26 Revert "FIX: calculation of $products_dispatched" 
This reverts commit 75ae611f9e.
 2019-07-18 17:00:57 +02:00
Florian Mortgat
770b419769 Revert "FIX: wrong display (and hidden input) for already dispatched quantity" 
This reverts commit b155fdc014.
 2019-07-18 17:00:46 +02:00
atm-ph
984fe98342 Fix missing hook 2019-07-18 16:12:42 +02:00
atm-ph
c961a397c4 Fix missing hook then can't interact with actions 2019-07-18 15:40:50 +02:00
Laurent Destailleur
ddc01b4c27 Removed the method liste_array() of project class. It was not used by 
core code.
 2019-07-18 14:22:05 +02:00
Laurent Destailleur
3b393e818a Fix missing entity property into fetch 2019-07-18 14:17:29 +02:00
Laurent Destailleur
e976195777 Fix missing key for api 2019-07-18 14:08:15 +02:00
Laurent Destailleur
5f917c6f7e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-18 13:26:39 +02:00
Laurent Destailleur
29974a5fbf Fix css 2019-07-18 13:26:19 +02:00
Christophe Battarel
5daf0316f9 also fix bad insert sql command 2019-07-18 11:18:25 +02:00
Laurent Destailleur
b5a7d21f97 Add opcodepreload.php file 2019-07-18 11:14:39 +02:00
Laurent Destailleur
c1df3ae5c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-18 11:10:18 +02:00
Laurent Destailleur
a23bae6c96 Work to mke the page perf.php public by default. 2019-07-18 11:10:09 +02:00
Christophe Battarel
32bc8a5faf FIX fournrprice log for insert 2019-07-18 11:05:51 +02:00
ptibogxiv
4235f0b352
Update stripe.class.php 2019-07-18 10:05:54 +02:00
ptibogxiv
8a5aad3433
Update stripe.class.php 2019-07-18 10:00:57 +02:00
ptibogxiv
27a0c046df
Update stripe.class.php 2019-07-18 09:58:26 +02:00
John Botella
b5d348356d Fix socpeople assigned list in action com list 2019-07-17 16:49:41 +02:00