Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
45,669 Commits 36 Branches 189 Tags
1a2bde14fb2fad0fab128f25a172579c8667cb15
Commit Graph

517 Commits

Author SHA1 Message Date
Regis Houssin
9a812a6c28 Fix: add filter for "dol_most_recent_files" for avoid conflict with 
option "Save file on server with name "FA0700034-Original filename""
 2015-06-06 13:03:02 +02:00
Laurent Destailleur
44f10ebec2 Fix: do not add new value 2015-04-13 13:01:23 +02:00
Laurent Destailleur
98b1d6170d Fix style fieldrequired must be used only in create/edit mode. 2015-04-03 01:07:17 +02:00
Laurent Destailleur
b8ed553365 We must keep the @, some tools use it to know it is login page. 2015-03-21 01:08:29 +01:00
Laurent Destailleur
a452823e1e Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility 
with 3.6
 2015-03-13 15:20:08 +01:00
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
 2015-03-11 03:29:52 +01:00
Estephe L.
9d320e4268 Fix Anchor link for quick access when editing. 
This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...
 2015-03-08 23:29:09 +01:00
Laurent Destailleur
a169b3348e Fix show alays date fields for contract module. 
Fix select of product were lost.
 2015-03-06 14:36:22 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
 2015-02-10 21:33:43 +01:00
Laurent Destailleur
039a184d70 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-02-10 21:13:12 +01:00
Christophe Battarel
04f83ae4ff FIX: always show fournprice select 2015-01-28 16:19:56 +01:00
Marcos García de La Fuente
78905c6af1 Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas 2015-01-17 20:29:51 +01:00
Laurent Destailleur
e4b89779f7 Fixed: css conflict 2015-01-10 21:39:40 +01:00
Marcos García de La Fuente
1179f722af Merge branch '3.7' into bug-1533 2014-12-25 01:26:00 +01:00
Laurent Destailleur
e8addcb8ba Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-23 12:25:21 +01:00
Marcos García de La Fuente
8a14409974 Fix: [ bug #1533 ] Links triggers do not show trigger error message 2014-12-23 11:39:43 +01:00
Laurent Destailleur
8d405a147f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
 2014-12-04 15:29:45 +01:00
Laurent Destailleur
a81c483061 Revert "Update objectline_create.tpl.php" 
This reverts commit fdac53bfca.
 2014-11-28 02:14:25 +01:00
Laurent Destailleur
9ba5e9434d Fix: W3C a label must be used if there is an "input" field only. Also it 
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
 2014-11-28 02:05:40 +01:00
aspangaro
aa8c165f06 Presentation 2014-11-23 21:03:34 +01:00
BENKE Charles
fdac53bfca Update objectline_create.tpl.php 
add label tags for product mode type
 2014-11-19 18:53:33 +01:00
Laurent Destailleur
737dfab5b2 Fix: If error on add line of type "product" when creating 
proposal/order/invoice, do not show date of services.
 2014-11-16 19:12:05 +01:00
Laurent Destailleur
7177c04378 Minor css enhancement 2014-11-11 20:45:30 +01:00
Laurent Destailleur
8a89997c79 Fix: bug into edition of extrafields 2014-11-07 22:40:13 +01:00
Laurent Destailleur
3d5a45e274 Fix: textarea too small 2014-11-07 22:19:31 +01:00
Laurent Destailleur
9e92b469b9 Merge pull request #2005 from altairis-fr/hidemargininfos 
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
 2014-11-07 21:47:06 +01:00
Juanjo Menent
2f30e769f6 Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown 2014-11-06 22:16:27 +01:00
Christophe Battarel
44882f4035 improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option 2014-11-05 17:03:53 +01:00
Laurent Destailleur
80581b2908 Merge pull request #1978 from atm-maxime/3.6 
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
 2014-10-30 17:56:22 +01:00
Maxime Kohlhaas
efd99a6f44 Fix : extrafield errors 2014-10-27 10:20:35 +01:00
MAxime Kohlhaas
374b761fdf Fix : product list was wrong on supplier invoice because fourn_id is not fetched 2014-10-25 19:20:02 +02:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Maxime Kohlhaas
452636b0e4 New : Add option to allow extrafield to be modified regardless of the document status 2014-10-14 15:27:40 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Maxime Kohlhaas
4fd67d725a Fix bug 1588 : relative discount not working anymore 2014-10-09 13:58:43 +02:00
Laurent Destailleur
168b0db094 Fix: button must be align to right 2014-10-08 15:09:07 +02:00
Laurent Destailleur
8bc57e38d1 Uniformize, support, install and login page with a more neutral 
background (nearest bootstrap). Remove image background.
 2014-10-03 01:48:14 +02:00
Laurent Destailleur
74cba062b4 Add a TODO to explain why we keep some extends into class. 
Should be removed once php min will be 5.4.
 2014-09-23 19:37:59 +02:00
Laurent Destailleur
08d4195504 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/fichinter/card.php
 2014-09-22 23:34:56 +02:00
Laurent Destailleur
f7f0059767 Missing hook to add button on intervention 
Prepare to move location into resource
Can select which king of contact show into contact tab.
 2014-09-22 20:16:58 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
154d1520fb Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1 2014-08-30 20:36:53 +02:00
Regis Houssin
a446318649 Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:32 +02:00
Regis Houssin
34561906fc Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:01 +02:00
Regis Houssin
76cb6f760a Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:02:13 +02:00
Laurent Destailleur
eb3c53d897 Merge pull request #1823 from Devensys/Develop-removeVersion 
Hidden version on login page
 2014-08-21 23:24:08 +02:00
Laurent Destailleur
c79fc516d3 Maj squelette 2014-08-14 17:27:28 +02:00
Andrelec1
1ffb964dd1 Change method 
Replace by existing constant ..
 2014-08-14 16:06:43 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Andrelec1
8b6d613cb0 Hidde version on login page 
Create option and use it in login template
 2014-08-12 12:29:20 +02:00