lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,858 Commits 43 Branches 150 Tags 886 MiB
f3c725f40f
Commit Graph

3731 Commits

Author SHA1 Message Date
Laurent Destailleur
b95fa8ad3e
Merge pull request #10038 from aspangaro/10.0_members 
NEW Add gender in member card
 2018-12-14 16:24:00 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Lionel VESSILLER
1512ba9242 Add contact status in category export 2018-12-12 14:20:04 +01:00
Laurent Destailleur
85af3ad513 NEW Unsubscribed emails are now stored in dedicated table 2018-12-11 10:24:57 +01:00
Laurent Destailleur
5ec9a1ca7f Remove deprecated parameter 2018-12-11 10:15:13 +01:00
Laurent Destailleur
21b3bbc2e6 Merge 2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-08 11:42:30 +01:00
Maxime Kohlhaas
550df138a6 Fix unexistant fields 2018-12-07 12:19:50 +01:00
fappels
6d27a6458e Fix travis 2018-12-05 11:10:42 +01:00
fappels
d1d41f4dd4 New add payments table to pdf expense report 2018-12-04 23:16:41 +01:00
Laurent Destailleur
f142238817 Fix missing field canvas 2018-12-04 21:25:59 +01:00
Philippe GRAND
e9e6d8b9b5 Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato> 2018-12-04 16:10:56 +01:00
Philippe GRAND
c113a7ca3b Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato> 2018-12-04 14:04:02 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
8fea6338e1 Fix #6565 
Fix pdf footer height for all documents
 2018-12-02 18:51:49 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
6f3d2e98a2
Merge pull request #10150 from frederic34/patch-9 
add log in empty catch
 2018-12-01 23:04:41 +01:00
Frédéric FRANCE
471ea35d6c
add log in empty catch 2018-12-01 22:26:45 +01:00
Frédéric FRANCE
c6291b3e08
Update pdf_strato.modules.php 2018-12-01 21:59:37 +01:00
Frédéric FRANCE
912f7c6c68
Update pdf_strato.modules.php 2018-12-01 21:41:40 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
13806124b2 Fix add missing fk_department and fk_pays in contact/bank imports 2018-12-01 17:11:04 +01:00
Frédéric FRANCE
9ceea06468
fix travis 2018-12-01 17:10:06 +01:00
florian HENRY
589511f38c fix #9999 2018-12-01 16:23:40 +01:00
florian HENRY
b9046b9174 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:42:07 +01:00
Laurent Destailleur
778547818d
Merge pull request #10108 from frederic34/patch-2 
Avoid adding libs not compatible with php 5.4
 2018-12-01 15:09:25 +01:00
Laurent Destailleur
30ed180dd4
Merge pull request #10122 from defrance/patch-129 
scrutinizer major error correction
 2018-12-01 14:29:42 +01:00
BENKE Charlene
676ac67817
scrutinizer error update 2018-12-01 11:49:25 +01:00
BENKE Charlene
1f91a763ff
scrutinizer major error correction 
It seems like $tasksarray can also be of type string. However, the property $lines is declared as type array<integer,object<Task>>. Maybe add an additional type check?
 2018-12-01 11:44:46 +01:00
Frédéric FRANCE
07da468109
Update modDav.class.php 2018-12-01 11:39:58 +01:00
Juanjo Menent
6104d16b08
Merge pull request #10117 from atm-maxime/fix_pdf_contract 
Fix pdf strato for contract with multipage
 2018-12-01 11:14:38 +01:00
Maxime Kohlhaas
2b5bf0e2dd Fix pdf strato for contract with multipage 2018-12-01 01:07:15 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Laurent Destailleur
4260d5765f Fix bad trans key 2018-11-30 11:50:32 +01:00
Laurent Destailleur
6fbf292a95 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-11-30 11:01:36 +01:00
Laurent Destailleur
dd357d167a Update ChangeLog 2018-11-30 11:00:42 +01:00
Laurent Destailleur
bbfd134733 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:24:18 +01:00
Laurent Destailleur
ea3e58a390
Merge pull request #10090 from hregis/8.0_bug3 
FIX remove constant for avoid problem
 2018-11-29 11:18:29 +01:00
Laurent Destailleur
9e20d9e847 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8 responsive 2018-11-29 11:03:02 +01:00
Regis Houssin
b4aa9ee335 FIX remove constant for avoid problem 2018-11-28 17:04:42 +01:00
Philippe GRAND
9bf0f12068 fix typo error 2018-11-26 14:32:04 +01:00
Laurent Destailleur
2e139d1960 Fix var $hidedetails not defined 2018-11-25 12:08:49 +01:00
Frédéric FRANCE
491270b27f
try to fix the expensereport pdf 2018-11-21 23:06:52 +01:00
Laurent Destailleur
07fe7e58d8 Code comment 2018-11-20 19:04:58 +01:00
Laurent Destailleur
4b82538941 Better module position 2018-11-20 14:56:14 +01:00
Laurent Destailleur
471f41577c
Merge pull request #10040 from defrance/patch-124 
Add societe extrafields on proposal export
 2018-11-19 18:33:41 +01:00
Laurent Destailleur
ade0363224 Module status 2018-11-19 15:46:20 +01:00
BENKE Charlene
92562ad89f
Add societe extrafields on export 2018-11-19 12:17:41 +01:00
Laurent Destailleur
824b1924e2 Fix loading of cronjob 2018-11-19 10:33:42 +01:00
Alexandre SPANGARO
2d55666a0b NEW Add gender in member card 2018-11-18 21:50:58 +01:00
Regis Houssin
7cba680f38 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-18 17:07:03 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
atm-quentin
56d4a8a737 revert some code 2018-11-16 15:16:48 +01:00
atm-quentin
7571760fdd fix errors during cherry picking 2018-11-16 11:31:23 +01:00
atm-quentin
70fdff5c27 revert getNextValue function + createfromclone entity 2018-11-16 11:23:14 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
atm-quentin
8e51204dff manage invoice with multicompany 2018-11-16 11:14:33 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc 
FIX compatibility between proposal sharing and proposalnumber sharing
 2018-11-15 17:19:28 +01:00
Laurent Destailleur
85cdc44105 Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
Regis Houssin
0907a6d611 FIX wrong object name (travis error) 2018-11-14 16:55:14 +01:00
Regis Houssin
874e27ef84 FIX multicompany override constants of current entity 2018-11-14 15:37:10 +01:00
Regis Houssin
93a1e941a4 FIX new method: override constants of current entity 2018-11-14 15:34:39 +01:00
Regis Houssin
9ff4b31843 FIX compatibility with invoice sharing and invoice number sharing 2018-11-14 15:24:22 +01:00
Regis Houssin
04edcaa89c FIX compatibility between proposal sharing and proposalnumber sharing 2018-11-13 20:20:46 +01:00
Laurent Destailleur
628918f863 Remove var_dump 2018-11-12 16:43:33 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
9d15f83f4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-08 20:19:45 +01:00
Laurent Destailleur
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +01:00
Laurent BOUQUET
320e7adef7 Fix blank lines and whitespace at end of lines 2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f Merge branch 'develop' into feature/product-search-barcode 2018-11-08 16:57:49 +01:00
Laurent Destailleur
5bbf7e8f1d Fix look and feel v8 2018-11-08 10:21:43 +01:00
Laurent Destailleur
6ba78b2bb3 Work on email collector 2018-11-07 16:33:06 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
c1cf4fbb95 Fix phpcs 2018-11-06 20:29:58 +01:00
Laurent Destailleur
e0070bd348 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2018-11-06 18:30:57 +01:00
Regis Houssin
d32fd9fda5 FIX export only prices of the current entity ! 2018-11-06 18:08:29 +01:00
Laurent Bouquet
f05b67909b NEW : Add product search from barcode via REST api 2018-11-06 12:13:16 +01:00
Laurent Destailleur
055a55b900 NEW Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and 
SHIPPING_PDF_HIDE_QTYTOSHIP
 2018-11-06 10:03:12 +01:00
Laurent Destailleur
52aa860008 Code comment 2018-11-06 09:39:22 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
90729c03c4 Fix dependencies of new modules 2018-11-05 10:28:44 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
7e55701774 2 remind of subscription expired by default 2018-11-03 11:41:45 +01:00
Laurent Destailleur
64b5e432c2 2 remind of expired subscription by default 2018-11-03 11:40:43 +01:00
Laurent Destailleur
0229b96178 Fix family of module 2018-11-03 11:38:29 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
4b402aa6d1 Fix regression on name of array 2018-10-31 15:41:00 +01:00
Laurent Destailleur
be8e48b265 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
	htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
	htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
 2018-10-31 15:38:29 +01:00
Laurent Destailleur
07719eaf1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +01:00