Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 20:11:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,840 Commits 36 Branches 190 Tags
068045f6a0a7abb6a68c8b4c1c86aff9420dba24
Commit Graph

1208 Commits

Author SHA1 Message Date
Laurent Destailleur
c441aa89db Fixed: Avoid warning 2015-01-10 18:19:44 +01:00
Laurent Destailleur
2c01a46774 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/paypal/lib/paypal.lib.php
 2014-12-18 10:13:25 +01:00
Christophe Battarel
c9f69279c7 FIX: pagebreak on fichinter like in other documents 2014-12-16 16:21:31 +01:00
Francis Appels
18406fc550 Fix: Show sender Country on PDF docs 
Show sender Country on PDF docs when sender Country != receiver Country
 2014-11-25 14:26:45 +01:00
Laurent Destailleur
4f08408065 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
 2014-11-05 16:28:44 +01:00
Laurent Destailleur
606a3f9917 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-11-04 17:54:09 +01:00
Maxime Kohlhaas
ccddf0d1be Fix : actioncomme report was not filtering by entity... 2014-10-31 16:56:14 +01:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
47339d0e62 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:26:27 +02:00
Regis Houssin
967991f31a Fix: project builddoc trigger is used now 2014-08-18 08:36:58 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Laurent Destailleur
adb70ecf24 Fix: [ bug #1528 ] Leopard Services numeration module description is not 
translated.
 2014-07-26 17:40:07 +02:00
Juanjo Menent
f8b5bac05c Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:40:18 +02:00
Juanjo Menent
3930c8829e Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:38:00 +02:00
Laurent Destailleur
faa5eba203 Fix: Substitution for external module at wrong place. 2014-07-04 18:43:37 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
fcb00b2024 Fix: [ bug #1425 ] 2014-06-20 13:38:44 +02:00
Laurent Destailleur
51eb761b02 Merge pull request #1669 from aspangaro/develop-patch1 
Correction on 3.6beta
 2014-06-20 13:12:39 +02:00
Laurent Destailleur
8ce8bf47ee Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:48:08 +02:00
Laurent Destailleur
4087781236 Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
 2014-06-20 12:41:23 +02:00
aspangaro
e469755d29 Divers 2014-06-16 06:17:46 +02:00
Florian HENRY
40a5d20cc8 Do not reset index on product import !!! 2014-06-12 16:46:20 +02:00
Florian HENRY
80facefa23 Fix [ bug #1454 ] Mention de bas de page erroné 2014-06-12 09:13:51 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2014-06-06 12:00:21 +02:00
Florian HENRY
ebe49b0525 Same bug, missing select column use in result 2014-06-05 10:58:38 +02:00
Florian HENRY
e8f8644bf4 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-05 10:53:20 +02:00
Florian HENRY
44a1059158 Fix warining message during societe activation 2014-06-05 10:53:00 +02:00
Marcos García de La Fuente
4c11e37203 Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text 2014-06-03 15:45:03 +02:00
aspangaro
bb4fed30a8 Salaries :: Missing key language & typo 2014-06-03 06:45:37 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
12fed4f4d7 Fix: CRLF 2014-05-26 12:32:33 +02:00
Laurent Destailleur
4b9d1b901b Fix: [ bug #1401 ] Problème avec la génération des codes barres 2014-05-25 17:14:33 +02:00
Laurent Destailleur
07bc933110 Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1405

Conflicts:
	ChangeLog
 2014-05-23 20:21:41 +02:00
Laurent Destailleur
2771c506e9 Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1407

Conflicts:
	ChangeLog
 2014-05-23 20:17:41 +02:00
Marcos García de La Fuente
fa733c8ba4 Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande 2014-05-23 11:42:14 +02:00
Marcos García de La Fuente
9cc74c36d2 Missing copyright info 2014-05-23 02:45:15 +02:00
Marcos García de La Fuente
77c09d887a Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes 2014-05-23 02:44:02 +02:00
Laurent Destailleur
3f96632e02 Fix: CRLF 2014-05-21 20:34:52 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b Fix: CRLF 2014-05-21 19:54:40 +02:00
Laurent Destailleur
366bd64c4f Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:44:53 +02:00
Laurent Destailleur
ff46adf284 Merge pull request #1607 from GPCsolutions/3.6b-review 
3.6b review
 2014-05-19 16:07:49 +02:00
Laurent Destailleur
e09cc127fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 15:10:46 +02:00
Raphaël Doursenaud
c83a0309b1 Barcode: fixed wrong menu 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
13cb2e478f Contracts module configuration: missing translation string 2014-05-19 14:37:30 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
00dd7db75e Fix: Miscellaneous fixes into emailing target selectors (missing field 
name, missing translation, sql syntax error, missing fiels other)
 2014-05-17 19:43:22 +02:00