Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

1859 Commits

Author SHA1 Message Date
Laurent Destailleur
d6d474f10d Clean code for category management. 2016-08-29 21:31:27 +02:00
philippe grand
cc97abb15e fix : search by search first name was not working 2016-08-28 15:49:00 +02:00
philippe grand
52c12cbecd fix : bad name 2016-08-28 14:37:53 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
philippe grand
9c22d94bd3 fix : bad sort 2016-08-19 17:12:46 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
f71b5d0605 FIX #5524 2016-07-27 14:19:13 +02:00
aspangaro
2e4bebbaf9 FIX Presentation correction 2016-07-27 07:24:36 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
1914b98375 Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-17 12:52:20 +02:00
Xebax
8a303fd4d8 FIX #5493 The login field is ignored when doing a "search in all" for 
members.
 2016-07-16 20:16:46 +02:00
Juanjo Menent
e5372e5636 NEW Do not use Functions Aliases 2016-07-15 17:31:44 +02:00
Laurent Destailleur
8e9a7cb629 Fix var not always defined 2016-07-06 11:20:09 +02:00
Laurent Destailleur
8bcd2e581f Fix of bugs reported by scrutinizer 2016-06-29 11:20:48 +02:00
Laurent Destailleur
8878c73732 Fix: link to other elements must be at end everywhere 2016-06-26 12:07:24 +02:00
Laurent Destailleur
09a868af3f FIX: Sync of password must follow same rule 'crypted or not' on both 
sides (user and member)
 2016-06-25 21:28:52 +02:00
Laurent Destailleur
f021a8ca31 FIX Bad error management into trigger of mailmanspip 2016-06-25 18:48:50 +02:00
Laurent Destailleur
227bdb9838 FIX extrafields was not visible on tab "subscription" 
FIX Link between membership and invoice was not saved
 2016-06-24 00:45:35 +02:00
philippe grand
0cc990402e internationalization of code comment 2016-06-19 17:39:40 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
philippe grand
cbdb9f9b2a internationalization of code comment 2016-06-18 11:52:41 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
fb13225173 Fix links on list from warnings dashboard 2016-06-06 16:31:50 +02:00
BENKE Charlie
a193920ddc if socity then company requiered 2016-06-04 18:40:53 +02:00
BENKE Charlie
af8e0802f8 fix : login required not verified on update 2016-06-04 18:15:52 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +02:00
Laurent Destailleur
cc68b885a3 Fix minor css errors 2016-05-30 22:39:26 +02:00
Laurent Destailleur
22d6d9497e Fix ambiguous test on ldap return of getAttributes 2016-05-29 11:20:12 +02:00
Laurent Destailleur
3a28935da3 Merge remote-tracking branch 'origin/3.9' into develop 2016-05-17 01:10:22 +02:00
philippe grand
45bdcd282a add mobile search within member list 2016-05-13 19:24:55 +02:00
philippe grand
23cae18765 add phone perso search within member list 2016-05-13 19:06:28 +02:00
philippe grand
740b6819c7 add phone pro search within member list 2016-05-13 17:49:16 +02:00
Laurent Destailleur
1835caad7b Better translation 2016-05-09 08:53:09 +02:00
philippe grand
07a10743f8 Fix : inverted columns 2016-05-08 16:20:32 +02:00
philippe grand
f4a533bafa Fix : when MAIN_VIEW_LINE_NUMBER is on 2016-05-08 16:09:00 +02:00
Laurent Destailleur
5cf8612c58 Fix scrutinizer errors 2016-05-08 12:08:23 +02:00
Laurent Destailleur
9311bb143c Fix missing extrafields in list 2016-05-07 18:54:36 +02:00
Laurent Destailleur
3784af00ea NEW Selection of fields is available on member list 2016-05-07 18:50:05 +02:00
Laurent Destailleur
47f27f353a update list of member 2016-05-07 17:42:34 +02:00
Laurent Destailleur
f78bc16076 FIX Option 'onlypicto' was showing also the ref 2016-05-05 23:39:58 +02:00
Laurent Destailleur
b4e5acbaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2016-05-04 14:43:40 +02:00
Laurent Destailleur
bcb4b2b607 Work on website module 2016-04-23 21:34:10 +02:00
Laurent Destailleur
78d18185e4 Several css enhancements 2016-04-22 11:11:08 +02:00
Laurent Destailleur
5b55af4d66 NEW Mutualize code: Use one call of function "addThumbs", when possible, 
to generate thumbs files instead of several call of "vignette" function.
 2016-04-09 14:12:21 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
BENKE Charlie
51b82eba43 if we not allowed to edit we don't edit 2016-03-25 18:19:51 +01:00
BENKE Charlie
6443170c4d FIX : Qual and some little fix 2016-03-25 17:19:45 +01:00