Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,691 Commits 36 Branches 190 Tags
2e511badf99f321ecd1a9c86b0dbb05662cb3fd6
Commit Graph

2783 Commits

Author SHA1 Message Date
Laurent Destailleur
77d1a15016 Activate warning for french "Loi Finance 2016" 2017-09-19 12:03:48 +02:00
Laurent Destailleur
0355b0d9ed Merge pull request #7414 from aspangaro/7.0-4 
Accountancy - Finish moving admin to specific menu & some cleaning
 2017-09-18 11:16:36 +02:00
Laurent Destailleur
630dc92a13 NEW Mass PDF Merging is available on contracts 2017-09-16 15:39:52 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-09-16 12:22:18 +02:00
Laurent Destailleur
ff7a17eb96 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2017-09-16 12:17:30 +02:00
Laurent Destailleur
e4767b1a51 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2017-09-16 12:11:18 +02:00
Alexandre SPANGARO
c2e1e2491d Accountancy - Finish moving admin to specific menu & some cleaning 2017-09-16 06:53:29 +02:00
Laurent Destailleur
bb6b3db0ac FIX Position of signature on strato template 
Conflicts:
	htdocs/core/modules/contract/doc/pdf_strato.modules.php
 2017-09-16 00:50:54 +02:00
Laurent Destailleur
f4de75afc3 FIX Position of signature on strato template 2017-09-16 00:49:00 +02:00
Laurent Destailleur
3c9532841f Fix regression db => this->db 2017-09-15 19:37:23 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
e02c220c08 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php
 2017-09-15 11:02:34 +02:00
Laurent Destailleur
dbb50d7b16 Fix PHP 7.2 2017-09-14 11:56:43 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00
Laurent Destailleur
e0eef2080e FIX PDF output was sharing 2 different currencies in same total 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2017-09-13 18:13:43 +02:00
Laurent Destailleur
60078300b8 FIX PDF output was sharing 2 different currencies in same total 2017-09-13 17:57:41 +02:00
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
 2017-09-12 13:26:25 +02:00
Regis Houssin
67e9b65a2e Fix: use $array_key value instead 2017-09-09 17:07:08 +02:00
Regis Houssin
db02c32a9f Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug3 2017-09-09 12:14:22 +02:00
Laurent Destailleur
8b20c5edab FIX Remove warning when using log into syslog 2017-09-08 15:46:06 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Regis Houssin
d4c20a919d Fix: avoid warning 2017-09-08 12:52:56 +02:00
Laurent Destailleur
c546243f00 Merge pull request #7328 from Dolibarr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2017-09-07 17:56:24 +02:00
Neil Orley
e43b13968e New: Adds an hide hour button in the "intervention" module 
Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module
 2017-09-07 15:31:19 +02:00
Laurent Destailleur
859d0dfe97 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-06 19:24:42 +02:00
Laurent Destailleur
9cc344f8cc Fix problem in type and customer code substitution in numbering module 2017-09-06 10:11:07 +02:00
fappels
5a75e14a8a Add supplier qty and supplier discount for export 2017-09-05 22:50:34 +02:00
Scrutinizer Auto-Fixer
c2d32aaf18 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-09-04 10:42:51 +00:00
Laurent Destailleur
ca93be5eed Fix priority of crons 2017-09-03 02:40:00 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
 2017-09-01 17:34:57 +02:00
Laurent Destailleur
8f34de1036 NEW Can include tag {uuu} into some numbering masks to replace with user 2017-08-29 19:44:35 +02:00
Laurent Destailleur
4d908c2dd0 Merge pull request #7299 from atm-maxime/new_expense_numbering 
New : add expense report numbering mask
 2017-08-29 18:24:17 +02:00
Laurent Destailleur
d96a83adac Fix bad total included tax when mutlicurrency is on 2017-08-29 16:37:00 +02:00
Laurent Destailleur
7218a9de0e Fix translation of total VAT 2017-08-29 13:52:24 +02:00
Laurent Destailleur
9312005318 NEW Move accountancy features into a dedicated menu 2017-08-29 12:43:47 +02:00
Laurent Destailleur
1b1ce4fdf5 Code comment 2017-08-27 19:40:43 +02:00
Laurent Destailleur
f33289ed6a Better examples 2017-08-27 19:15:06 +02:00
Maxime Kohlhaas
350b24f32b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_expense_numbering 2017-08-27 17:53:19 +02:00
Maxime Kohlhaas
9eeacd8982 Fix const name 2017-08-27 10:58:01 +02:00
Maxime Kohlhaas
61fadfd0e1 New numbering module for expense report + admin setup 2017-08-27 10:49:51 +02:00
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/card.php
 2017-08-26 22:33:56 +02:00
BENKE Charlene
831947b6d1 Little cleaning code 
$bottomlastpage is same in two case
 2017-08-26 16:37:32 +02:00
Laurent Destailleur
a9e7f8b9e6 Fix trans 2017-08-25 21:27:19 +02:00
Laurent Destailleur
54cc1ac800 Merge emailing target selectors. 2017-08-25 21:20:27 +02:00
Regis Houssin
ad39c30c21 Fix: change old email 2017-08-23 21:23:18 +02:00
Laurent Destailleur
9cd5c8a564 Code comment 2017-08-22 18:34:58 +02:00
Laurent Destailleur
2104ab9aed Disable event reminder 2017-08-21 13:11:29 +02:00
Laurent Destailleur
fe724a2e69 Fix syntax error 2017-08-21 12:35:43 +02:00
Laurent Destailleur
260beed512 NEW Generated files are now indexed in database 2017-08-18 23:19:55 +02:00