Laurent Destailleur
eaee252a5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-04 12:56:12 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
Laurent Destailleur
60ce5fb87e
Merge pull request #8911 from fappels/develop_fix_properties_for_trigger
...
FIX stock movement trigger is missing some data
2018-06-04 12:20:47 +02:00
Laurent Destailleur
5ae25cf95b
Merge pull request #8898 from frederic34/patch-10
...
do not test *.min.css with phpcs
2018-06-04 12:20:04 +02:00
Laurent Destailleur
536e8297c2
Merge pull request #8897 from areaeuro/patch-3
...
FIX Delete thirdparty logo
2018-06-04 12:19:41 +02:00
fappels
e0f9605483
Fix add missing properties for trigger
2018-06-03 11:05:02 +02:00
Laurent Destailleur
a6104d18a9
CSS
2018-06-02 16:36:05 +02:00
Laurent Destailleur
034ce7e55d
CSS
2018-06-02 10:36:22 +02:00
Laurent Destailleur
5ff3398048
Try to fix evil Google Chrome autopopulate bug
2018-06-01 18:27:17 +02:00
Laurent Destailleur
be2c49d490
Fix log
2018-06-01 17:39:07 +02:00
Laurent Destailleur
b094ae953e
Better log
2018-06-01 17:20:49 +02:00
Laurent Destailleur
3f6d11cf26
Fix log
2018-06-01 16:23:42 +02:00
Laurent Destailleur
7c0afbe025
Clean code
2018-05-31 17:12:08 +02:00
Laurent Destailleur
0503373e31
Avoid error on screen
2018-05-31 09:49:46 +02:00
Frédéric FRANCE
03bba4daf0
do not test *.min.css with phpcs
2018-05-30 13:30:14 +02:00
areaeuro
475297b98b
Update card.php
...
Line 714 - conditional to delete thirdparty logos
$object->photo
does not exits, and should read
$object->logo
This appears to be an oversight, as it is correct in the rest of the file
2018-05-30 12:29:02 +02:00
Laurent Destailleur
d8d4d15b4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:13:18 +02:00
Laurent Destailleur
0412264418
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:05:54 +02:00
Laurent Destailleur
60321aabd8
Fix regression
2018-05-30 11:59:23 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines
...
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Laurent Destailleur
62e717acb3
Update .travis.yml
2018-05-30 11:18:47 +02:00
Laurent Destailleur
ec36f24046
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-30 11:17:21 +02:00
Laurent Destailleur
a6e323fae8
Fix bad usage of "for" loop
2018-05-30 11:16:06 +02:00
Laurent Destailleur
3733169120
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/recap-compta.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 11:09:53 +02:00
Laurent Destailleur
2df2071bae
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-30 11:05:12 +02:00
Laurent Destailleur
02da9b6992
FIX #8893 to get formatted price as substitution vars
2018-05-30 11:04:44 +02:00
Laurent Destailleur
28646a6b50
Merge pull request #8892 from ATM-Nicolas/fix_bad_email_substitution_key
...
FIX : Bad substitution key used for default send proposal email
2018-05-30 10:57:31 +02:00
Laurent Destailleur
e8d7c54716
Merge pull request #8890 from inoveaconseil/patch-3
...
Fix missing substitution
2018-05-30 10:52:35 +02:00
Laurent Destailleur
40f681695c
Merge pull request #8888 from Mavyre/develop
...
FIX Button Classify abandonned for donation not displaying
2018-05-30 10:51:22 +02:00
Laurent Destailleur
696b4c219e
Merge branch 'develop' into develop
2018-05-30 10:51:12 +02:00
Laurent Destailleur
1ad2ca3648
Merge pull request #8889 from rassakali/patch-4
...
Update card.php
2018-05-30 10:50:32 +02:00
Laurent Destailleur
7590df85e6
Merge pull request #8887 from atm-florian/6.0
...
add hook on balence pages
2018-05-30 10:47:59 +02:00
Laurent Destailleur
aa59c380ad
Merge pull request #8886 from ATM-Nicolas/fix_supplier_order
...
FIX : Keep supplier proposal price for supplier order
2018-05-30 10:45:37 +02:00
Laurent Destailleur
e57ceab5de
Update fournisseur.commande.class.php
2018-05-30 10:45:06 +02:00
ATM-Nicolas
48a315f6cd
FIX : Bad substitution key used for default send proposal email
2018-05-30 10:14:34 +02:00
Inovea Conseil
fc7b88e5e6
Fix missing substitution
...
Missing substitution for object
2018-05-29 23:04:35 +02:00
rassakali
52a9c787bb
Update card.php
...
Fix #5606
2018-05-29 21:00:46 +02:00
Mavyre
6ba6258d14
Fixed Classify abandonned not displaying
2018-05-29 17:36:24 +02:00
florian HENRY
b65b545e0f
add hook on balence pages
2018-05-29 16:29:14 +02:00
Laurent Destailleur
ee83b9a7b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-29 12:48:01 +02:00
Laurent Destailleur
57664c5a26
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/list.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
2018-05-29 12:47:42 +02:00
Laurent Destailleur
b846f0f84c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-29 12:42:33 +02:00
Laurent Destailleur
95e3c5a4b1
Backport fix of file list check generation
2018-05-29 12:13:58 +02:00
ATM-Nicolas
6b0b975ffd
FIX : Keep supplier proposal price for supplier order
2018-05-29 11:21:30 +02:00
Laurent Destailleur
5b96b1b0e3
Merge pull request #8882 from atm-florian/develop
...
fix command list
2018-05-29 11:15:19 +02:00
Laurent Destailleur
51b5f63ce8
Merge pull request #8880 from wdammak/patch-14
...
Add movement generateDocument function (mode dev)
2018-05-29 11:15:00 +02:00
Laurent Destailleur
2ae9591d0d
Fix english name
2018-05-29 11:10:21 +02:00
Laurent Destailleur
8a6207efda
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-29 11:09:30 +02:00
Laurent Destailleur
e64d15a6e0
Update .travis.yml
2018-05-29 11:04:26 +02:00
