Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,390 Commits 39 Branches 191 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

40390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Laurent Destailleur
35596acf40 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/product/fiche.php
 2013-11-20 23:46:33 +01:00
Laurent Destailleur
cb539399a0 Merge pull request #1302 from FHenry/develop 
Fix output of extrafield select list from table
 2013-11-20 14:42:50 -08:00
Laurent Destailleur
4adf5fc1b9 Merge pull request #1314 from FHenry/3.4 
Remove useless code (the tag replacement into footer and header is already done by SetVar method)
 2013-11-20 14:42:11 -08:00
Laurent Destailleur
a9d5363799 Merge pull request #1313 from altairis-fr/3.3 
[Task 1144 ] Fix wrong max-length of produt ref
 2013-11-20 14:33:57 -08:00
Laurent Destailleur
03006db5a7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 3.5.beta1_20131120 2013-11-20 23:10:59 +01:00
Laurent Destailleur
1ef08a88a4 Update packager 2013-11-20 23:10:38 +01:00
Laurent Destailleur
a26e337550 Update doc 2013-11-20 23:05:27 +01:00
Laurent Destailleur
040e3eec78 Update doc 2013-11-20 15:10:54 +01:00
Laurent Destailleur
71484a4e1e Fix: Missing hook declaration 2013-11-20 14:29:50 +01:00
Florian Henry
f88e9425ec Remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 14:01:43 +01:00
Florian Henry
361d34f7db Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-20 13:58:26 +01:00
Florian Henry
306a51f6bd remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 13:54:53 +01:00
Laurent Destailleur
413e0908fe Doxygen 2013-11-20 12:55:13 +01:00
Laurent Destailleur
63e1ecccd3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-20 12:46:05 +01:00
Laurent Destailleur
b04a12c39a Missing vat rate for canada 2013-11-20 12:45:38 +01:00
Christophe Battarel
e654dac578 [Task 1144 ] Fix wrong max-length of produt ref 2013-11-20 10:33:06 +01:00
Regis Houssin
4c29bddfda Fix: wrong variable name 
Fix: restore address.class.php, this class is used
 2013-11-20 09:40:56 +01:00
Regis Houssin
f305524e29 Revert "Qual: Removed not used file" 
This reverts commit 603c2aa938.
 2013-11-20 09:34:54 +01:00
Florian Henry
7c10632d7a Change-Id: I57c62abf6ea8a70c08336a7d38571fbdd487d640 2013-11-20 01:09:33 +01:00
Florian Henry
7446714351 Change-Id: I5e7b46592e3f8cd8637af36b6e6f385c8d0ae794 2013-11-20 01:08:43 +01:00
Florian Henry
ed21b573ea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-20 00:46:50 +01:00
Florian Henry
0fe870395f Use mtethos Post instead of get 2013-11-20 00:46:04 +01:00
Laurent Destailleur
c92d0fe966 Fix: phpunit 2013-11-19 23:06:25 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Laurent Destailleur
568c296c6c Merge pull request #1310 from GPCsolutions/develop-nocrlf 
Use LF instead of CRLF
 2013-11-19 11:44:51 -08:00
Laurent Destailleur
25bbe824f1 Merge pull request #1309 from csalvador/develop-formcontract-include 
included the FormContract class to avoid fatal error
 2013-11-19 11:43:53 -08:00
Laurent Destailleur
583a3dadb1 Merge pull request #1308 from FHenry/3.4 
[ bug #1142 ] Set paiement on invoice
 2013-11-19 11:43:21 -08:00
Laurent Destailleur
0f9f610635 Merge pull request #1311 from GPCsolutions/develop-fixaddline 
Make AJAX new line form work again
 2013-11-19 11:43:01 -08:00
Raphaël Doursenaud
7945011955 Make AJAX new line form work again 
FIXME: Factorize!
 2013-11-19 17:54:36 +01:00
Raphaël Doursenaud
83f99b5ba6 Use LF instead of CRLF 2013-11-19 14:36:55 +01:00
Cédric Salvador
c885389ac6 included the FormContract class to avoid fatal error 2013-11-19 14:23:17 +01:00
Florian Henry
68718c6100 Update changelog 2013-11-19 10:42:29 +01:00
Florian Henry
870b78fc19 [ bug #1142 ] Set paiement on invoice 2013-11-19 10:41:00 +01:00
Laurent Destailleur
6596a105e7 Merge pull request #1307 from hameau/patch-2 
Update printipp.lang
 2013-11-18 11:43:50 -08:00
Laurent Destailleur
04efe611af Merge pull request #1306 from hameau/patch-1 
Update main.lang
 2013-11-18 11:42:48 -08:00
hameau
9d2dee207a Update bills.lang 
Minor typos
 2013-11-18 18:13:34 +01:00
hameau
a94fb12e5e Update other.lang 
Minor typo
 2013-11-18 18:07:17 +01:00
hameau
c04d454d4f Update withdrawals.lang 
Minor typos.
 2013-11-18 18:05:36 +01:00
hameau
0501491475 Update printipp.lang 
Minor typos; minor translation fr->en.
 2013-11-18 17:45:19 +01:00
hameau
b28d15574e Update main.lang 
Minor typos; capitalise month names; minor fr->en.
 2013-11-18 17:34:08 +01:00
Laurent Destailleur
a71e4c598a Fix: Must navigate between all thirdparties elligible for tab. 2013-11-18 15:41:42 +01:00
Laurent Destailleur
4d31a0ca2a Fix: Removed duplicate line 2013-11-18 14:27:17 +01:00
Laurent Destailleur
2d260fa6dd Fix: Missing alignement 2013-11-18 14:25:53 +01:00
Laurent Destailleur
69f0d596ba Fix: Pagination 2013-11-18 12:20:53 +01:00
Laurent Destailleur
e8101e3cde Fix: Missing field 2013-11-18 12:00:42 +01:00
Laurent Destailleur
2b63fd67b5 Minor fix in cron feature 2013-11-18 11:42:28 +01:00
Laurent Destailleur
5703dfe55a Trans 2013-11-18 11:31:34 +01:00
Laurent Destailleur
3884c33535 Merge pull request #1304 from altairis-fr/3.4 
Fix bad translation on margin config
 2013-11-17 16:15:23 -08:00
Laurent Destailleur
d209d931e4 Doxygen 2013-11-18 00:29:11 +01:00