Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,103 Commits 35 Branches 179 Tags 1.7 GiB
a23bae6c96
Commit Graph

17290 Commits

Author SHA1 Message Date
Laurent Destailleur
4387d40b9a Translation lignes -> lines 2019-07-05 21:55:08 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
709b738d75 Fix regression 2019-07-05 18:54:51 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
9b32763919 Fix label for report n ledger for transitionnal bank account on tranfer 2019-07-05 15:25:29 +02:00
Laurent Destailleur
e3359c6f0f FIX Can't submit a ticket from public interface 2019-07-05 11:21:04 +02:00
Laurent Destailleur
01b1b2e4a7 Fix syntax error 2019-07-04 17:07:26 +02:00
Laurent Destailleur
1c33dd2e75
Merge pull request #11436 from fbosman/fbosman-patch-1 
Feature request: Extrafields - store computed value #11435
 2019-07-04 16:23:08 +02:00
Laurent Destailleur
0d738a04f9
Update admin_extrafields_edit.tpl.php 2019-07-04 16:22:10 +02:00
Laurent Destailleur
f14b0b4fcc
Update admin_extrafields_add.tpl.php 2019-07-04 16:20:01 +02:00
Laurent Destailleur
b691396fce
Update admin_extrafields_add.tpl.php 2019-07-04 16:19:24 +02:00
Laurent Destailleur
4e00cfb455 Clean code 2019-07-04 16:02:04 +02:00
Laurent Destailleur
fb8c93a69d FIX Bad sql request 2019-07-04 16:00:14 +02:00
Laurent Destailleur
9db86112bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 15:43:15 +02:00
Laurent Destailleur
f2c1568d09 NEW Extrafields separator can be collapsed or not 2019-07-04 15:43:05 +02:00
Laurent Destailleur
35bce50a1d
Merge pull request #11455 from atm-florianm/FIX_add_hook_to_fileupload_to_enable_modules_to_override_upload_options 
NEW: Add hook on fileupload.class.php to enable modules to override…
 2019-07-04 12:50:21 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
Laurent Destailleur
8b0b824471 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-04 12:22:48 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/action/card.php
 2019-07-04 12:22:40 +02:00
Laurent Destailleur
63c93be94e
Update html.form.class.php 2019-07-04 12:20:34 +02:00
atm-florian.m
cf458c77dc FIX: hook added on fileupload.class.php to enable modules to override upload options 2019-07-04 12:04:39 +02:00
Laurent Destailleur
75aa11e526 Code comment 2019-07-04 02:02:44 +02:00
Laurent Destailleur
27ba3408b4 Fix code comment 2019-07-04 02:01:55 +02:00
Laurent Destailleur
95b6f03bf5 Code comment 2019-07-04 01:58:25 +02:00
atm-greg
2f5b9ccb22 fix case objecttmp is an invoice 2019-07-03 17:00:18 +02:00
Frans Bosman
cd7d4de6ec
Update commonobject.class.php 2019-07-03 16:53:26 +02:00
Frans Bosman
9962243df3
Update admin_extrafields_edit.tpl.php 2019-07-03 16:19:51 +02:00
Frans Bosman
123cf7ce50
Update admin_extrafields_add.tpl.php 2019-07-03 16:16:45 +02:00
Frans Bosman
135e47892b
Update admin_extrafields_add.tpl.php 2019-07-03 16:15:20 +02:00
Frans Bosman
116c6d7a6a
Update commonobject.class.php 2019-07-03 11:09:24 +02:00
Frans Bosman
9064737930
Update commonobject.class.php 2019-07-03 07:08:53 +02:00
Frans Bosman
221c202add
Update commonobject.class.php 2019-07-03 06:59:52 +02:00
Laurent Destailleur
9d50c67208 FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export 2019-07-02 18:06:51 +02:00
Laurent Destailleur
d9560dbb61 Fix var not initialized 2019-07-02 18:02:06 +02:00
Laurent Destailleur
3b0f1c733f Fix missing token 2019-07-02 15:00:17 +02:00
Laurent Destailleur
c9477f5c4f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:29:33 +02:00
fbosman
3e91fdda77
Update commonobject.class.php 2019-07-01 12:34:27 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
Laurent Destailleur
3461a61cbf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 18:35:54 +02:00
Laurent Destailleur
e9c6a10bdd Fix phpcs 2019-06-29 18:35:36 +02:00
Laurent Destailleur
b177787f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
 2019-06-29 18:28:51 +02:00
Laurent Destailleur
72084f4684 Fix protected 2019-06-29 16:49:32 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
b37f55d13a Add log 2019-06-29 16:06:40 +02:00
Laurent Destailleur
d71330c00b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d NEW Add statistics on product into contracts 2019-06-29 02:03:57 +02:00
Laurent Destailleur
cd024da628
Merge branch 'develop' into new_branch_27_06_2019 2019-06-28 13:39:27 +02:00
Laurent Destailleur
ff7ae5ef20
Update extrafields.class.php 2019-06-28 12:56:31 +02:00
Laurent Destailleur
511be75fca
Update actions_extrafields.inc.php 2019-06-28 12:55:19 +02:00