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

10237 Commits

Author SHA1 Message Date
Laurent Destailleur
d940cc392a FIX Several fix to exclude WON/LOST of reporting of opportunities amount 
(sometimes we need, sometimes not).
 2016-07-08 10:59:13 +02:00
Laurent Destailleur
5ebbe02853 Fix missing trackid into parameters of hooks 2016-07-07 16:26:00 +02:00
Laurent Destailleur
56e374ff0d Fix remove warnings 2016-07-07 15:41:11 +02:00
Regis Houssin
ee02ff43d7 Fix: add entity field in llx_societe_remise_except, useful when 
third-sharing is used with multicompany
 2016-07-07 12:26:30 +02:00
florian HENRY
2d932066c7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_password_extrafeilds_type 2016-07-07 09:17:39 +02:00
florian HENRY
1bb28648c4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	build/pad/DoliWamp.pml
	build/pad/Dolibarr.pml
	build/pad/pad_dolibarr.xml
	build/pad/pad_doliwamp.xml
 2016-07-07 09:05:13 +02:00
Laurent Destailleur
f756f3db0e Fix hook context 'all' 2016-07-07 01:23:20 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
Laurent Destailleur
8505c5db09 Code comment 2016-07-06 13:26:49 +02:00
Laurent Destailleur
759b265eeb Merge pull request #5447 from atm-florian/dev_fix5446 
FIX #5446 Extrafields select list filter on other select list do not work
 2016-07-06 11:46:21 +02:00
Laurent Destailleur
16c1816e7c Merge pull request #5445 from atm-florian/develop 
FIX hidden extrafield feature edit
 2016-07-06 11:35:19 +02:00
Laurent Destailleur
0af555126c Fix PHPCS 2016-07-06 11:23:32 +02:00
Laurent Destailleur
c360189d94 Code comment 2016-07-06 11:14:17 +02:00
Laurent Destailleur
b4c8822281 Fix style of text after ref on invoices 2016-07-05 16:27:14 +02:00
Maxime Kohlhaas
d658e2cf31 FIX task ODT company object not correctly retrieved 2016-07-05 16:04:18 +02:00
florian HENRY
fc2e7fb1ad FIX #5446 2016-07-05 15:45:33 +02:00
florian HENRY
1d96f5316e travis 2016-07-05 15:14:28 +02:00
florian HENRY
22f028d101 FIX hidden extrafield feature edit 2016-07-05 09:05:10 +02:00
florian HENRY
afb924043f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	htdocs/core/modules/mailings/advthirdparties.modules.php
 2016-07-04 20:43:14 +02:00
Laurent Destailleur
c24d68a038 Picto for expense report 2016-07-03 21:14:45 +02:00
Laurent Destailleur
de157d9099 Fix quick search on tasks 2016-07-03 20:15:26 +02:00
Scrutinizer Auto-Fixer
a8b1699abb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-07-02 18:26:31 +00:00
Laurent Destailleur
3d72f788b9 Fix phpcs 2016-07-02 18:02:39 +02:00
Laurent Destailleur
fe86ef5774 Thirdparty into keyword, encoded with convToOutputCharset 2016-07-02 17:00:45 +02:00
Laurent Destailleur
525b2cf297 Fix: Edition of contract on intervention failed 2016-07-02 12:02:51 +02:00
Laurent Destailleur
7d9671f6d3 Fix bad separator in url 2016-07-02 11:44:46 +02:00
Laurent Destailleur
3eaf0bc4bf Fix bad translation 2016-07-02 11:32:06 +02:00
Laurent Destailleur
76d24ac8ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-02 11:27:13 +02:00
Laurent Destailleur
91d2d573c3 Fix NNE has been replaced with ICS 2016-07-02 11:26:55 +02:00
Laurent Destailleur
59f86a12d2 Fix delete of documents generated on project. 
Fix missin translation
 2016-07-01 17:49:13 +02:00
florian HENRY
9bbde79755 fix travis 2016-07-01 15:09:28 +02:00
florian HENRY
32e954c8d8 Merge branch 'develop' of local repository into dev_fix5353 2016-07-01 15:08:15 +02:00
Laurent Destailleur
62d7303d8f Add comment 2016-07-01 03:40:48 +02:00
Laurent Destailleur
5713d293e3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-01 03:22:16 +02:00
Laurent Destailleur
625213580c Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-07-01 03:17:20 +02:00
Laurent Destailleur
3645bd8f69 Merge pull request #5420 from atm-alexis/FIX_3.8_bug_5170 
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
 2016-07-01 03:06:31 +02:00
Laurent Destailleur
05384b2f88 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/list.php
	htdocs/projet/card.php
	htdocs/societe/consumption.php
 2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/sendings.lib.php
 2016-07-01 02:06:30 +02:00
Laurent Destailleur
c9300bae35 Merge pull request #5415 from fmarcet/3.8 
Fix: Incorrect document link on supplier invoices's list
 2016-06-30 22:31:18 +02:00
Laurent Destailleur
f3821c30f3 Merge pull request #5412 from atm-florian/dev_compta 
Dev compta
 2016-06-30 21:58:45 +02:00
Laurent Destailleur
03c420b34e Merge pull request #5403 from atm-florian/dev_fixwarning 
Fix box PHP strict warning
 2016-06-30 21:34:26 +02:00
Laurent Destailleur
db0b806c7b Merge pull request #5434 from atm-florian/dev_fix4672 
Dev fix4672
 2016-06-30 21:00:48 +02:00
florian HENRY
215f397f33 Cannot reproduce 4793 still fix other bug on PgSQL 2016-06-30 17:28:13 +02:00
florian HENRY
37ee64ae9b fix 4672 2016-06-30 17:10:06 +02:00
phf
8c133d8546 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_develop_issue_2858 
Conflicts:
	htdocs/core/class/ldap.class.php
 2016-06-30 17:09:22 +02:00
Alexis Algoud
afeb212520 FIX #4682 dol_time_plus_duree use datetime instead of strtotime 2016-06-30 16:16:27 +02:00
florian HENRY
d431e73ec8 Fix #5353 2016-06-30 15:49:57 +02:00
Alexis Algoud
22bc44620b FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option 2016-06-30 14:27:58 +02:00
fmarcet
e4a2b5abb3 Fix: Incorrect document link on supplier invoices's list 2016-06-30 11:27:29 +02:00