Commit Graph

1381 Commits

Author SHA1 Message Date
Laurent Destailleur
adc96cc826 Merge pull request #1853 from aspangaro/develop-accounting
Integration of module Accounting Expert
2014-09-02 19:14:21 +02:00
BENKE Charles
05ed96f7fa Update modContrat.class.php
add export contract/service feature
2014-09-02 10:45:53 +02:00
Laurent Destailleur
f245f43a3f Doxygen 2014-08-31 23:18:09 +02:00
Laurent Destailleur
f2affade35 Doxygen 2014-08-31 23:06:58 +02:00
aspangaro
07377e7156 Merge branch 'Upstream/develop' 2014-08-30 04:42:36 +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
Laurent Destailleur
5dc35ec137 Fix: Missing field tobuy into service export.
Fix: Filter on date into export.
Fix: Tooltip help.
2014-08-29 20:25:54 +02:00
aspangaro
bc686a7995 Test Correct travis 2014-08-29 06:43:05 +02:00
aspangaro
bb7aa9f29c Merge branch 'Upstream/develop' 2014-08-29 06:33:00 +02:00
Laurent Destailleur
711e7e6fc6 Fix: phpunit test
Fix: debian readme to upgrade tcpdf lib.
2014-08-28 16:59:10 +02:00
Laurent Destailleur
013023204f Merge pull request #1841 from GPCsolutions/modules
Modules classes documentation enhancements
2014-08-28 11:58:13 +02:00
aspangaro
6f8234dd60 Update Eldy menu 2014-08-28 07:13:33 +02:00
aspangaro
add4528e6c Update perms 2014-08-28 06:48:22 +02:00
aspangaro
d03763f6c3 Update Accounting Expert integration 2014-08-28 06:30:01 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00
Laurent Destailleur
7cb283d0ea Prepare code to be able to choose what to show into footer 2014-08-25 19:16:37 +02:00
Laurent Destailleur
e3fede595f Removed all triggers _BUILDOC. Building a document is not a business
status change but a technical action. So hooks must be used instead.


Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch

Conflicts:
	htdocs/core/modules/project/modules_project.php
	htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
2014-08-22 00:01:53 +02:00
Laurent Destailleur
04b611f758 Merge pull request #1820 from aspangaro/develop-trad1
Qual: Renamed table llx_c_civilite into llx_c_civility
2014-08-21 23:25:49 +02:00
Laurent Destailleur
cb3cb1f734 Merge pull request #1837 from GPCsolutions/civility_id
Fix: module still using deprecated civilite_id
2014-08-21 23:21:21 +02:00
Laurent Destailleur
061a3384fc Merge pull request #1836 from GPCsolutions/dictionaries
Fix: module still using deprecated dictionnaries
2014-08-21 23:21:08 +02:00
Laurent Destailleur
c799f0f10f Uniformize code:
New: Call to hook after generation is also done into odt.
Fix: Missing hook before save.
2014-08-21 15:02:18 +02:00
Raphaël Doursenaud
c3b30893fc Enhanced modules parent class methods documentation 2014-08-21 12:17:13 +02:00
Raphaël Doursenaud
29ca4b7a0a Enhanced modules parent class properties documentation 2014-08-21 12:15:15 +02:00
Raphaël Doursenaud
9f02bc78a7 Fix: module still using deprecated civilite_id 2014-08-20 10:54:35 +02:00
Raphaël Doursenaud
820ae82088 Fix: module still using deprecated dictionnaries 2014-08-20 10:46:09 +02:00
aspangaro
0f7e09d01f Merge branch 'Upstream/develop' 2014-08-20 07:54:33 +02:00
Laurent Destailleur
a26a7cedf8 Qual: Uniformize code. Trigger PROJECT_BUILDDOC is removed because
building a doc is not a business event. For technical action after
creation of a pdf, hook "afterPDFCreation" must be used instead.
2014-08-19 14:51:10 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
Regis Houssin
68aca6f2bb Fix: project builddoc trigger is used now 2014-08-18 08:40:35 +02:00
Regis Houssin
967991f31a Fix: project builddoc trigger is used now 2014-08-18 08:36:58 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
2014-08-14 01:04:15 +02:00
Florian HENRY
3c96063165 fix travis 2014-08-12 18:38:27 +02:00
Florian HENRY
ca05345a60 Fix Travis 2014-08-12 18:20:36 +02:00
Florian HENRY
db7478098a Add a real free numbering module for contract 2014-08-12 13:26:06 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility
field civilite into label in the same table and field civilite into civility in other table
2014-08-12 06:03:27 +02:00
aspangaro
f7c31d651c Correct 2014-08-11 20:34:07 +02:00
aspangaro
e3ced8487a Correct 2014-08-11 20:33:13 +02:00
aspangaro
f2b9b8b1bb Correct 2014-08-11 20:06:10 +02:00
aspangaro
671f8e0be5 Correct 2014-08-11 14:03:30 +02:00
aspangaro
7d433f9845 Correct 2014-08-11 13:50:16 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
4e8ec8e598 Revert "Add Reduction value in pdf"
This reverts commit 0b5707c1cf.
2014-08-04 18:36:18 +02:00
Laurent Destailleur
8d867dde69 Merge pull request #1797 from Devensys/Develop-AddValueReduction
Add Reduction value in pdf
2014-08-04 09:01:45 +02:00
Laurent Destailleur
be76fd93fd New: Add user of creation and validation on invoice export 2014-08-01 22:24:25 +02:00
Andrelec1
0b5707c1cf Add Reduction value in pdf
Add value of %reduction in pdf
2014-08-01 14:49:42 +02:00
Laurent Destailleur
852b78f79f Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for
constants into database driver classes.
2014-08-01 00:53:29 +02:00
Laurent Destailleur
8e5cbb1f6c Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into
marcosgdf-patch-2

Conflicts:
	test/phpunit/Functions2LibTest.php
2014-07-31 17:21:46 +02:00
Laurent Destailleur
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
355ec7fd27 Fix: Avoid pgsql error of duplicate record making rollback. 2014-07-27 23:52:42 +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
Marcos García de La Fuente
097e8d33a2 Removed PHP 5.3 comparison in ImportCsv 2014-07-22 04:16:32 +02:00
Laurent Destailleur
bf926cd791 Merge pull request #1756 from marcosgdf/messages
Migrated old message notifications to the """new""" system
2014-07-20 04:57:09 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
Laurent Destailleur
04a20d2008 - New: Enable feature developed for 3.6 we forgot to enabled: Adding
prefix on uploaded file names. 
- New: No more dependency between contract and service module.
2014-07-19 22:05:35 +02:00
Laurent Destailleur
3a625ce6bf Merge pull request #1741 from marcosgdf/url-not-available
Removed index.php and replaced them with blank index.html as it is more appropiate
2014-07-14 23:20:32 +02:00
Juanjo Menent
9410b18473 Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:43:48 +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
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Laurent Destailleur
e5d5a25433 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
2014-07-05 11:54:02 +02:00
Laurent Destailleur
faa5eba203 Fix: Substitution for external module at wrong place. 2014-07-04 18:43:37 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
Juanjo Menent
3679a4ba90 [ task #1063 ] Allow edit localtaxes rate for thirds. Works documents
pdf
2014-07-04 13:11:51 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Maxime Kohlhaas
7d16f62a9d New : add remaining to ship on delivery PDF 2014-06-28 22:48:20 +02:00
Laurent Destailleur
4cd3a4f4aa Fix: bad indice 2014-06-27 01:34:27 +02:00
Laurent Destailleur
f25bb79d80 Merge pull request #1672 from defrance69/patch-19
Add project and task boxes
2014-06-26 22:03:38 +02:00
Laurent Destailleur
534e574379 Merge pull request #1668 from aspangaro/develop-dons
Move donation receipt to french model cerfa 11580*03
2014-06-26 22:03:13 +02:00
Laurent Destailleur
656dd94011 Merge pull request #1657 from mkdgs/patch-1
Add customers/supplier status fo contact export
2014-06-26 21:58:23 +02:00
Laurent Destailleur
79dec7ad90 Merge pull request #1641 from defrance69/patch-17
Patch 17
2014-06-26 21:43:45 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
Conflicts:
	htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
BENKE Charles
fa75ef3b57 made change on all the modules_element definition 2014-06-21 00:35:11 +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
BENKE Charles
66dc82621d Update modProjet.class.php
add boxe definition on projet module
2014-06-18 21:37:56 +02:00
Florian HENRY
df9f153142 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
2014-06-17 12:01:45 +02:00
aspangaro
e469755d29 Divers 2014-06-16 06:17:46 +02:00
aspangaro
f4efd3b2e8 Move donation receipt to french model cerfa 11580*03 2014-06-15 22:18:19 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Florian HENRY
40a5d20cc8 Do not reset index on product import !!! 2014-06-12 16:46:20 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Florian HENRY
80facefa23 Fix [ bug #1454 ] Mention de bas de page erroné 2014-06-12 09:13:51 +02:00
Mickael Desgranges
57b4cb08b7 Update modSociete.class.php 2014-06-11 13:28:31 +02:00
Mickael Desgranges
81e715f34c Update modSociete.class.php 2014-06-11 12:26:54 +02:00
Mickael Desgranges
84f1b8c02b Add customers/supplier status fo contact export
When you export a contact list it's usefull to know if your contact is a prospect, client or supplier
2014-06-11 12:22:24 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
BENKE Charles
f806b4373a Update modules_commande.php
don't display specific version
2014-06-06 15:30:33 +02:00
BENKE Charles
37c908aa99 Update modules_propale.php
don't display specific number of version
2014-06-06 15:29:45 +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
Florian HENRY
d304c7785e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/modules/mailings/pomme.modules.php
2014-05-29 14:28:01 +02:00
Florian HENRY
c19eabf711 Better target emailing status mangement 2014-05-29 14:26:27 +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
Laurent Destailleur
eec5d6d313 Fix: Error management of mass email feature 2014-05-17 19:02:47 +02:00
Laurent Destailleur
f7d1e93136 Move module to status development 2014-05-14 12:27:09 +02:00
Laurent Destailleur
0027dc30f5 Fix: Modules into core should never, by definition, activate hooks
(hooks are architecture solution for external module)
2014-05-14 12:14:18 +02:00
Laurent Destailleur
757d92a318 Merge pull request #1589 from aternatik/resource_core
Core integration of resource module
2014-05-14 11:25:25 +02:00
Laurent Destailleur
5f0c4dbe48 Fix: TCPDF error file not found in member card generation 2014-05-12 10:07:57 +02:00
Laurent Destailleur
6b1bdf9913 Merge pull request #1587 from aternatik/odt_thirdpartycontact
Fix : bad call of extrafields into contact substitution
2014-05-12 01:53:41 +02:00
Laurent Destailleur
d4534f4a0b Fix: [ bug #1384 ] Wrong name for import products and product prices 2014-05-11 17:52:16 +02:00
Marcos García de La Fuente
7b05944530 Corrected strings not translated and typos in English language 2014-05-11 13:14:45 +02:00
jfefe
45aa1b9136 Use hook for resource card 2014-05-11 12:11:58 +02:00
jfefe
901c083ce6 Fix : bad link to list into resource menu 2014-05-11 00:26:54 +02:00
Jean-François Ferry
6a9bf009f2 Clean code 2014-05-10 22:07:13 +02:00
Jean-François Ferry
c5e02edfa8 Add submenu for adding resource 2014-05-10 22:06:23 +02:00
Jean-François Ferry
1caffcffaf Add new perm to link resource to an element 2014-05-10 22:06:23 +02:00
Jean-François Ferry
c04812cd15 Fix: bad lang file 2014-05-10 22:06:22 +02:00
Jean-François Ferry
e76ce87547 Remove unused css 2014-05-10 22:03:05 +02:00
Jean-François Ferry
6e24004e82 Remove resource module config page 2014-05-10 22:03:05 +02:00
Jean-François Ferry
e63f8b87c1 Mark resource module as experimental / need Dolibarr 3.5 2014-05-10 22:03:05 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00
Laurent Destailleur
12055aa44a I did a better fix to have no more dependencies between modules. 2014-05-10 19:04:33 +02:00
Laurent Destailleur
c20a5d7e18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 19:02:55 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
work but it does not enable it
2014-05-10 18:57:04 +02:00
jfefe
31044f1f72 Fix : bad call of extrafields into contact substitution (works with socpeople) 2014-05-10 18:51:54 +02:00
Juanjo Menent
4e53b57313 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
work but it does not enable it
2014-05-10 17:54:13 +02:00
Laurent Destailleur
40577ab445 New: Can enter holiday for someone else if user has permission for. 2014-05-07 15:03:05 +02:00
Laurent Destailleur
9add45aea3 Qual: Mutualize code. 2014-05-07 13:22:02 +02:00
Laurent Destailleur
845f764f93 Increase default size of image 2014-05-07 12:21:14 +02:00
Marcos García de La Fuente
8681079fa7 Fixed CR 2014-05-07 10:42:13 +02:00