Commit Graph

72072 Commits

Author SHA1 Message Date
Juanjo Menent
ca717a7ce1
Merge pull request #9152 from frederic34/patch-12
Update card-rec.php
2018-08-02 10:50:50 +02:00
Juanjo Menent
82bdbd6f6e
Merge pull request #9151 from frederic34/patch-11
Update card.php
2018-08-02 10:50:05 +02:00
Juanjo Menent
2206eb98d1
Merge pull request #9191 from Dolibarr/revert-9147-7.0_price
Revert "FIX multicompany compatibility !"
2018-08-02 10:46:20 +02:00
Juanjo Menent
99f29a9764
Revert "FIX multicompany compatibility !" 2018-08-02 10:45:15 +02:00
Juanjo Menent
e6f416e745
Merge pull request #9147 from hregis/7.0_price
FIX multicompany compatibility !
2018-08-02 10:45:01 +02:00
Juanjo Menent
fcd9d49b16
Merge pull request #9159 from grandoc/new_branch_25_07_2018
Clean and update code
2018-08-02 10:36:27 +02:00
ptibogxiv
40b19b8e1d
update to Stripe Requirements and Best Practices
cf https://stripe.com/docs/partners/requirements
2018-08-01 11:50:43 +02:00
ptibogxiv
d50a95c89b
update to straipe
cf https://stripe.com/docs/building-plugins#setappinfo
2018-08-01 11:40:12 +02:00
Alexandre SPANGARO
ee61a88540 Small fix 2018-08-01 07:46:17 +02:00
florian HENRY
ceb85cfa45 fix : odt project and task extrafields management 2018-07-31 17:29:08 +02:00
gauthier
cadf931e8d FIX : extrafieldkey 2018-07-31 15:02:51 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
ATM-Nicolas
b9a44fc76b FIX : Wrong position of firstname lastname 2018-07-31 12:15:18 +02:00
florian HENRY
5d19361782 fix: keep context filter on contact list on change column displayed 2018-07-31 11:39:54 +02:00
atm-quentin
37a4a0c488 fix for travis 2018-07-31 10:02:36 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
STAGIAIRE-PC\Pierre
61995a3e02 Ajout d'une colonne indispensable dans la requete json 2018-07-30 17:34:43 +02:00
Philippe GRAND
d673848028 standardize 2018-07-30 17:28:44 +02:00
ATM-Nicolas
1536bbc65e FIX : Keep same project when creating shipping from order 2018-07-30 15:16:53 +02:00
STAGIAIRE-PC\Pierre
ff8d31925b ajout du parametre companyBankid 2018-07-30 09:37:41 +02:00
Philippe GRAND
fb565b15c5 standardize 2018-07-29 19:16:28 +02:00
Philippe GRAND
d1f100b0c9 standardize 2018-07-29 17:17:29 +02:00
tarrsalah
8278a9fa52 FIX filter supplier invoice list by societe name. 2018-07-29 13:18:05 +01:00
Philippe GRAND
de70bf983e standardize 2018-07-29 13:40:35 +02:00
Philippe GRAND
69feb3af14 standardize 2018-07-29 11:33:52 +02:00
Philippe GRAND
892174cbf8 standardize 2018-07-29 10:29:12 +02:00
Frédéric FRANCE
7dada7ae8e
fix #8820 2018-07-29 09:15:42 +02:00
Philippe GRAND
36ea20b7d4 standardize 2018-07-28 18:03:14 +02:00
Philippe GRAND
9cc40fcb21 standardize 2018-07-28 17:26:56 +02:00
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +02:00
Philippe GRAND
5a4524451c standardize 2018-07-28 14:02:33 +02:00
All-3kcis
e9267c54ce add include productfournisseur 2018-07-27 15:04:16 +02:00
Philippe GRAND
541e919ae0 Clean and update code 2018-07-27 14:49:33 +02:00
All-3kcis
a00150a3fb Revert "Enable auto update PDF on update note"
This reverts commit 4c10efb7d3.
2018-07-27 14:48:31 +02:00
All-3kcis
8d23aa305f Move code into "htdocs/core/actions_setnotes.inc.php" 2018-07-27 14:47:22 +02:00
Regis Houssin
e1877625a0 FIX clean code 2018-07-27 13:42:44 +02:00
Laurent Destailleur
8ab03c469a Fix migration 2018-07-27 13:42:32 +02:00
Laurent Destailleur
7af42c66cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/comm/propal/list.php
2018-07-27 12:54:45 +02:00
Laurent Destailleur
894f484de8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-27 12:34:02 +02:00
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
Philippe GRAND
4eacad52f2 Clean and update code 2018-07-27 10:06:56 +02:00
Frédéric FRANCE
7186589e1c
trim trailing 2018-07-26 20:21:33 +02:00
Frédéric FRANCE
b90d125fda
trim trailing 2018-07-26 20:19:52 +02:00
Frédéric FRANCE
526ea496ee
trim trailing 2018-07-26 19:26:03 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing 2018-07-26 19:05:34 +02:00
Frédéric FRANCE
f8e7d71ae8
trim trailing 2018-07-26 18:33:00 +02:00
Frédéric FRANCE
8312d95174
trim trailing 2018-07-26 18:22:16 +02:00
Frédéric FRANCE
c991a4d204
trim trailing 2018-07-26 18:05:20 +02:00
Frédéric FRANCE
39f5641fed
trim trailing 2018-07-26 17:33:36 +02:00