Philippe GRAND
|
9fab0a1d45
|
Update comments
|
2018-09-21 14:16:22 +02:00 |
|
Philippe Grand
|
d5003c9d3c
|
Merge branch 'develop' into new_branch_21_09_2018
|
2018-09-21 13:55:04 +02:00 |
|
Philippe GRAND
|
92a484dcd9
|
Standardize and update code
|
2018-09-20 15:07:43 +02:00 |
|
Philippe GRAND
|
c0dc4f3a48
|
Standardize and update code
|
2018-09-20 13:52:57 +02:00 |
|
Philippe GRAND
|
50073fe98d
|
Standardize and update code
|
2018-09-20 12:16:31 +02:00 |
|
Philippe GRAND
|
bd87b1381d
|
Standardize and update code
|
2018-09-20 12:14:30 +02:00 |
|
Philippe GRAND
|
d2d40ef0a3
|
Standardize and update code
|
2018-09-20 12:12:37 +02:00 |
|
Philippe GRAND
|
4b51227ca9
|
Standardize and update code
|
2018-09-20 12:10:13 +02:00 |
|
Philippe GRAND
|
5979db7733
|
Standardize and update code
|
2018-09-20 12:07:23 +02:00 |
|
Philippe GRAND
|
32beccc3be
|
Standardize and update code
|
2018-09-20 12:02:23 +02:00 |
|
Philippe GRAND
|
67147582af
|
Standardize and update code
|
2018-09-20 12:00:10 +02:00 |
|
Philippe GRAND
|
1adc4bad9e
|
Standardize and update code
|
2018-09-20 09:17:25 +02:00 |
|
Philippe GRAND
|
06ad6e7196
|
Standardize and update code
|
2018-09-20 09:04:12 +02:00 |
|
Philippe GRAND
|
ad84340bf5
|
Standardize and update code
|
2018-09-20 09:03:26 +02:00 |
|
Philippe GRAND
|
bd3ba04e24
|
Standardize and update code
|
2018-09-19 16:36:08 +02:00 |
|
Philippe GRAND
|
30e426e487
|
Standardize and update code
|
2018-09-19 16:21:52 +02:00 |
|
Philippe GRAND
|
ad061f4e13
|
Standardize and update code
|
2018-09-18 11:14:21 +02:00 |
|
Laurent Destailleur
|
963d5eeddf
|
Merge pull request #9387 from frederic34/camelCaps2
start changing phpcs:ignore
|
2018-09-12 21:14:34 +02:00 |
|
Philippe GRAND
|
04017367f9
|
Standardize and update code
|
2018-09-12 19:24:45 +02:00 |
|
Frédéric FRANCE
|
85df267a5b
|
move phpcs:ignore
|
2018-09-05 20:36:44 +02:00 |
|
Frédéric FRANCE
|
f7c3ca9d20
|
move phpcs:ignore
|
2018-09-05 18:49:06 +02:00 |
|
Frédéric FRANCE
|
7799774ca1
|
move phpcs:ignore
|
2018-09-04 22:52:55 +02:00 |
|
Frédéric FRANCE
|
1ae1afe843
|
move phpcs:ignore
|
2018-09-04 08:09:48 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Philippe GRAND
|
edb566501d
|
Update and standardize code
|
2018-08-17 18:54:41 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Philippe GRAND
|
640f7697e4
|
update code
|
2018-06-30 11:45:49 +02:00 |
|
Laurent Destailleur
|
0e6aa3def3
|
Fix duplicate deprecated file
|
2018-05-25 11:26:50 +02:00 |
|
Laurent Destailleur
|
9f2f8ca7e0
|
Fix scrutinizer
|
2018-05-25 09:31:16 +02:00 |
|
Laurent Destailleur
|
a1c799507a
|
Fix $contactobject not always defined
|
2018-05-23 08:16:24 +02:00 |
|
Laurent Destailleur
|
55f982e504
|
Removed deprecated FPDI option and reorganise PDF setup page
|
2018-04-30 09:28:24 +02:00 |
|
Laurent Destailleur
|
38d1fc27e0
|
Start to introduce common substitution rules for odt substitutions
|
2018-02-24 13:41:01 +01:00 |
|
Laurent Destailleur
|
3987033aab
|
Fix substitution in public notes of pdf
|
2018-01-21 20:53:36 +01:00 |
|
Laurent Destailleur
|
90ddfc3f7f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/translation.php
|
2018-01-11 01:14:20 +01:00 |
|
Ferran Marcet
|
d99535d9da
|
Fix: Still using property ->client instead of ->thirdparty.
|
2018-01-10 16:40:43 +01:00 |
|
Laurent Destailleur
|
2cb190fc5c
|
Fix return code
|
2017-11-17 15:27:59 +01: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
|
60078300b8
|
FIX PDF output was sharing 2 different currencies in same total
|
2017-09-13 17:57:41 +02:00 |
|
Laurent Destailleur
|
260beed512
|
NEW Generated files are now indexed in database
|
2017-08-18 23:19:55 +02:00 |
|
Laurent Destailleur
|
768df56c07
|
Uniformize name of standard PDF template
|
2017-05-04 20:16:55 +02:00 |
|
Laurent Destailleur
|
7354cb148a
|
Fix scrutinizer
|
2017-04-15 03:13:17 +02:00 |
|
Laurent Destailleur
|
3e9ccc186a
|
NEW Small PDF template for products
|
2017-04-13 10:26:12 +02:00 |
|
arnaud
|
192a825de8
|
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
|
2017-03-14 09:25:29 +01:00 |
|
arnaud
|
a796a321cc
|
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
|
2017-03-10 12:16:55 +01:00 |
|
arnaud
|
1d31603ad2
|
Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo
|
2017-03-10 11:46:59 +01:00 |
|
Laurent Destailleur
|
8a4e957554
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-01-27 01:23:44 +01:00 |
|
fappels
|
2be6011069
|
Fix product elephant verify for service
|
2017-01-23 20:59:32 +01:00 |
|