dolibarr

mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 07:32:32 +01:00

Files

Laurent Destailleur 7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php

2017-10-18 19:51:29 +02:00

company

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-10-18 19:51:29 +02:00

individual

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-10-18 19:51:29 +02:00

actions_card_common.class.php

Fix GETPOST of lang_id

2017-06-27 17:27:01 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

README

…

README

This directory contains an example on how we can use
the canvas feature to overwrite the thirdparty screen and
sql code by new one.

This directory is used only if thirdpartie's pages are called
with option canvas=newcanvas@societe parameter.
If yes, screens are replaced by template in
htdocs/societe/canvas/newcanvas directory
and actions are also replaced by actions in
htdocs/societe/canvas/newcanvas directory.

In standard usage of Dolibarr, this directory can be removed.