Philippe GRAND
|
2e7256a094
|
update code
|
2019-04-09 09:38:35 +02:00 |
|
Philippe GRAND
|
1b2aa27c2f
|
update code
|
2019-04-09 09:37:21 +02:00 |
|
Philippe GRAND
|
3ff5c6b42b
|
update code
|
2019-04-09 09:36:51 +02:00 |
|
Philippe GRAND
|
144ebb2f89
|
update code
|
2019-04-09 09:35:39 +02:00 |
|
Philippe GRAND
|
1d84dcbe17
|
update code
|
2019-04-09 09:34:26 +02:00 |
|
Philippe GRAND
|
c26afe15ff
|
update code
|
2019-04-09 09:33:20 +02:00 |
|
Philippe GRAND
|
350a04108f
|
update code
|
2019-04-09 09:32:18 +02:00 |
|
Philippe GRAND
|
edd5661f1a
|
update code
|
2019-04-09 09:31:33 +02:00 |
|
Philippe GRAND
|
3a209d2454
|
update code
|
2019-04-09 09:30:32 +02:00 |
|
Philippe GRAND
|
42df91e4e2
|
update code
|
2019-04-09 09:29:01 +02:00 |
|
Philippe GRAND
|
30e2d8fa6b
|
update code
|
2019-04-09 09:28:01 +02:00 |
|
Philippe GRAND
|
327ac2973e
|
update code
|
2019-04-09 09:27:25 +02:00 |
|
Philippe GRAND
|
2ed71b0039
|
update code
|
2019-04-09 09:26:39 +02:00 |
|
Philippe GRAND
|
baecb20562
|
update code
|
2019-04-09 09:24:41 +02:00 |
|
Philippe GRAND
|
0de76fc128
|
update code
|
2019-04-09 09:23:50 +02:00 |
|
Philippe GRAND
|
f833bbcb32
|
update code
|
2019-04-09 09:21:34 +02:00 |
|
Philippe GRAND
|
68c1332244
|
update code
|
2019-04-09 09:19:16 +02:00 |
|
Laurent Destailleur
|
a19cedfc13
|
Fix phpcs
|
2019-04-09 00:48:12 +02:00 |
|
Laurent Destailleur
|
c0b3ee23e5
|
Fix phpcs
|
2019-04-08 23:50:18 +02:00 |
|
Laurent Destailleur
|
d01b54ca5b
|
Fix phpcs
|
2019-04-08 18:02:27 +02:00 |
|
Laurent Destailleur
|
1274d71a10
|
Fix phpcs
|
2019-04-08 16:00:01 +02:00 |
|
Laurent Destailleur
|
2b87c8b663
|
Merge pull request #10810 from mwelters/patch-1
NEW improve Expensereport, Inverse Receiver
|
2019-04-08 14:04:08 +02:00 |
|
Laurent Destailleur
|
a7ced8ab5d
|
Merge pull request #10963 from aspangaro/v10_p3
NEW: Accounting - Invert module name
|
2019-04-08 13:39:51 +02:00 |
|
Laurent Destailleur
|
2606de2119
|
Update modAccounting.class.php
|
2019-04-08 13:35:06 +02:00 |
|
Laurent Destailleur
|
976ef92df6
|
Merge pull request #10958 from atm-john/new_look_and_feel_pdf
New pdf document column system : supplier order and expedition
|
2019-04-08 13:31:47 +02:00 |
|
Laurent Destailleur
|
54714bc755
|
Deprecated property ->fk_departement is now ->state_id everywhere.
|
2019-04-05 20:06:13 +02:00 |
|
Laurent Destailleur
|
67760d6f41
|
Fix phpcs
|
2019-04-05 19:53:45 +02:00 |
|
Laurent Destailleur
|
997d6cca0a
|
Fix $db not defined
|
2019-04-05 19:49:47 +02:00 |
|
Alexandre SPANGARO
|
4335ea9064
|
NEW: Accounting - Invert module name
|
2019-04-04 17:13:20 +02:00 |
|
John BOTELLA
|
3299b765f1
|
New pdf models
|
2019-04-04 10:16:20 +02:00 |
|
John BOTELLA
|
a668cc28b1
|
Add table title auto height
|
2019-04-03 16:19:49 +02:00 |
|
Laurent Destailleur
|
76bf412f95
|
Fix phpcs
|
2019-04-03 14:40:15 +02:00 |
|
Laurent Destailleur
|
bfed3685a5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-04-03 13:27:13 +02:00 |
|
Laurent Destailleur
|
7120078b0f
|
NEW Simplification of styles architcture: Showing or not the menuhider
is completely decided by CSS and screen size instead of PHP+CSS.
|
2019-04-03 13:26:50 +02:00 |
|
Laurent Destailleur
|
64889f4639
|
Merge pull request #10947 from grandoc/new_branch_01_04_2019
update comments
|
2019-04-03 11:05:05 +02:00 |
|
Philippe Grand
|
ebe50a4efe
|
Update pdf_sponge.modules.php
|
2019-04-02 15:33:10 +02:00 |
|
Philippe Grand
|
b978014fb9
|
Update pdf_eratosthene.modules.php
|
2019-04-02 15:32:01 +02:00 |
|
markus
|
c08b69d00b
|
Rely on MAIN_INVERT_SENDER_RECIPIENT
|
2019-04-01 19:59:58 +02:00 |
|
Laurent Destailleur
|
8fe1be1a67
|
Removed deprecated use of string in dol_print_date(). Only date allowed.
|
2019-04-01 19:27:34 +02:00 |
|
Philippe GRAND
|
b154ae752a
|
update comments
|
2019-04-01 09:43:07 +02:00 |
|
Philippe GRAND
|
e8e5e5cfb9
|
update comments
|
2019-04-01 09:42:01 +02:00 |
|
Philippe GRAND
|
e2c5c49c52
|
update comments
|
2019-04-01 09:40:50 +02:00 |
|
Philippe GRAND
|
2b41e9166d
|
update comments
|
2019-04-01 09:39:22 +02:00 |
|
Philippe GRAND
|
eb901e7c4e
|
update comments
|
2019-04-01 09:38:23 +02:00 |
|
Philippe GRAND
|
46488f6a0c
|
update comments
|
2019-04-01 09:36:52 +02:00 |
|
Philippe GRAND
|
2c41610ac8
|
update comments
|
2019-04-01 09:21:08 +02:00 |
|
Philippe GRAND
|
ae681eaf06
|
update comments
|
2019-04-01 09:18:56 +02:00 |
|
Philippe GRAND
|
f828e6ee90
|
update comments
|
2019-04-01 09:15:48 +02:00 |
|
Laurent Destailleur
|
ce62e7f7ec
|
Merge pull request #10939 from OPEN-DSI/new-exports-fields
New add fields in contact export
|
2019-03-31 19:00:16 +02:00 |
|
Lionel VESSILLER
|
a52935f6e4
|
New add fields in contact export
- thirdparty fields (address, phone, email, typent)
- contact field (status)
|
2019-03-28 18:29:36 +01:00 |
|
Alexandre SPANGARO
|
9f9dd2cd30
|
NEW: Add import of accounting account for intra/export selling on product card
|
2019-03-28 11:41:59 +01:00 |
|
markus
|
f942917f53
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
|
2019-03-24 17:42:49 +01:00 |
|
Laurent Destailleur
|
df9e121ac6
|
Enhance the module debugbar. Do not scan the log anymore.
|
2019-03-23 14:37:54 +01:00 |
|
markus
|
b0e12deb25
|
Fix travis
|
2019-03-20 09:36:23 +01:00 |
|
markus
|
8c010c2580
|
fix travis
|
2019-03-18 10:24:21 +01:00 |
|
Laurent Destailleur
|
bb8845ac41
|
Merge pull request #10865 from atm-maxime/new_box_birthdays
NEW Widget birthdays of the month
|
2019-03-18 08:56:58 +01:00 |
|
markus
|
b4807e7972
|
remove unneeded class
|
2019-03-17 18:38:26 +01:00 |
|
Maxime Kohlhaas
|
e090cd6f87
|
New box birthdays of the month
|
2019-03-17 16:55:26 +01:00 |
|
Laurent Destailleur
|
1abfd1f58e
|
Add page to setup module debugbar
Fix CSS
|
2019-03-17 00:32:39 +01:00 |
|
Laurent Destailleur
|
95c1275efc
|
Fix phpcs
|
2019-03-16 20:10:22 +01:00 |
|
Laurent Destailleur
|
c2badb57d7
|
NEW: Add module debugbar
|
2019-03-16 16:27:14 +01:00 |
|
markus
|
a45fbfae76
|
fix travis
|
2019-03-16 14:37:07 +01:00 |
|
Philippe GRAND
|
3d65b887a7
|
update with html5 compliant code
|
2019-03-14 14:34:33 +01:00 |
|
Philippe GRAND
|
719ecde6e9
|
update with html5 compliant code
|
2019-03-14 14:34:04 +01:00 |
|
Philippe GRAND
|
756bdfc6a8
|
update with html5 compliant code
|
2019-03-14 14:33:36 +01:00 |
|
Philippe GRAND
|
9ee27936f7
|
update with html5 compliant code
|
2019-03-14 14:33:00 +01:00 |
|
Philippe GRAND
|
ad9f75d3e9
|
update with html5 compliant code
|
2019-03-14 14:32:26 +01:00 |
|
Philippe GRAND
|
80858b39d9
|
update with html5 compliant code
|
2019-03-14 14:31:40 +01:00 |
|
Philippe GRAND
|
f71769e0e6
|
update with html5 compliant code
|
2019-03-14 14:31:08 +01:00 |
|
Philippe GRAND
|
f13d520830
|
update with html5 compliant code
|
2019-03-14 14:30:41 +01:00 |
|
Philippe GRAND
|
b4a9b3aa20
|
update with html5 compliant code
|
2019-03-14 14:30:08 +01:00 |
|
Philippe GRAND
|
5977cdad26
|
update with html5 compliant code
|
2019-03-14 14:29:16 +01:00 |
|
Philippe GRAND
|
6c4070eb87
|
update with html5 compliant code
|
2019-03-14 14:28:36 +01:00 |
|
Philippe GRAND
|
310670b3f6
|
update with html5 compliant code
|
2019-03-14 14:27:54 +01:00 |
|
Philippe GRAND
|
f082bd3e96
|
update with html5 compliant code
|
2019-03-14 14:27:16 +01:00 |
|
Philippe GRAND
|
af4edbba2b
|
update with html5 compliant code
|
2019-03-14 14:26:43 +01:00 |
|
Philippe GRAND
|
d21dbe915b
|
update with html5 compliant code
|
2019-03-14 14:26:08 +01:00 |
|
Philippe GRAND
|
6b878a2c64
|
update with html5 compliant code
|
2019-03-14 14:25:21 +01:00 |
|
Rafael Ingenleuf
|
f19574f27f
|
changed UserBankAccount fetch
|
2019-03-12 11:57:50 +01:00 |
|
markus
|
e1f9e845cc
|
remove empty line
|
2019-03-11 16:44:15 +01:00 |
|
markus
|
bdb03bd454
|
add class
|
2019-03-11 16:41:01 +01:00 |
|
markus
|
d7ca08afb0
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
|
2019-03-10 15:26:35 +01:00 |
|
markus
|
47fce826fe
|
changes
|
2019-03-10 14:15:06 +01:00 |
|
markus
|
1737229eab
|
update hints
|
2019-03-10 13:59:32 +01:00 |
|
markus
|
47f15897aa
|
remove double line
|
2019-03-10 13:49:01 +01:00 |
|
markus
|
6a8d76ea39
|
honor MAIN_INVERT_SENDER_RECIPIENT
|
2019-03-10 13:44:50 +01:00 |
|
markus
|
6f05d6ea36
|
changes
|
2019-03-10 13:41:18 +01:00 |
|
markus
|
dcaed95bfe
|
changes
|
2019-03-10 13:31:51 +01:00 |
|
markus
|
6ef6248d58
|
use fk_user_author
|
2019-03-10 13:27:22 +01:00 |
|
markus
|
b4c8977a44
|
next step
|
2019-03-10 13:22:21 +01:00 |
|
markus
|
b302f569a9
|
make public
|
2019-03-10 13:14:17 +01:00 |
|
markus
|
5b0ed63f6d
|
use global $user
|
2019-03-10 13:11:43 +01:00 |
|
Frédéric FRANCE
|
b69f63e7d7
|
replace html by html5
|
2019-03-10 09:32:19 +01:00 |
|
markus
|
1ac54853d9
|
improve
|
2019-03-09 18:34:57 +01:00 |
|
markus
|
a789cfe576
|
fix typo
|
2019-03-09 18:32:44 +01:00 |
|
markus
|
b8ec0b20b0
|
#3700 New Switch EXPENSEREPORT_INVERT_SENDER_RECIPIENT
|
2019-03-09 18:22:37 +01:00 |
|
Laurent Destailleur
|
b710e28ffa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/admin/adherent.php
htdocs/admin/barcode.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/admin.lang
|
2019-03-09 01:20:13 +01:00 |
|
Laurent Destailleur
|
e38427a41f
|
Fix var not initialized
|
2019-03-08 19:56:21 +01:00 |
|
markus
|
e452a2e31d
|
add bank lib
|
2019-03-08 18:14:22 +01:00 |
|
markus
|
41c21b88c1
|
More output
|
2019-03-08 16:46:08 +01:00 |
|
markus
|
1bf99b81f1
|
Display more
|
2019-03-08 16:44:35 +01:00 |
|
Markus Welters
|
fac99ccd98
|
Merge pull request #2 from countiy/patch-1
expensereport changed IBAN
|
2019-03-08 16:37:04 +01:00 |
|
markus
|
c595dca5e7
|
fix typo
|
2019-03-08 16:35:11 +01:00 |
|
Rafael Ingenleuf
|
a505323fe7
|
expensereport changed IBAN
|
2019-03-08 16:27:08 +01:00 |
|
Rafael Ingenleuf
|
bcd3921561
|
expensereport layout changed and IBAN added
|
2019-03-08 15:36:09 +01:00 |
|
Laurent Destailleur
|
1a96a7a88f
|
FIX More complete auto setup of barcode module
Add tooltip help on member setup module
|
2019-03-08 11:31:12 +01:00 |
|
Christophe Battarel
|
d414e3eb48
|
add product extrafields
|
2019-03-07 15:00:48 +01:00 |
|
Laurent Destailleur
|
daaa4ca0c2
|
Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed
PSR2.Classes.PropertyDeclaration.VarUsed
|
2019-03-07 12:49:13 +01:00 |
|
Christophe Battarel
|
a6bb1cf5f6
|
avoid timeout
|
2019-03-07 11:27:06 +01:00 |
|
Frédéric FRANCE
|
2745f98644
|
PSR2.Classes.PropertyDeclaration.VarUsed
|
2019-03-05 22:10:46 +01:00 |
|
Laurent Destailleur
|
cfd39a1483
|
Merge pull request #10742 from OPEN-DSI/fix-pdf-beluga-orientation
Fix authorize long references in Beluga PDF model (uses Landscape mode)
|
2019-03-05 18:45:02 +01:00 |
|
Laurent Destailleur
|
16e90ffae4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/langs/en_US/website.lang
|
2019-03-05 15:59:42 +01:00 |
|
Laurent Destailleur
|
d18a5853df
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
|
2019-03-05 15:57:31 +01:00 |
|
Laurent Destailleur
|
98f5bb2ed3
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-05 15:55:08 +01:00 |
|
Laurent Destailleur
|
b851911708
|
Dolibarize module ticket
|
2019-03-05 12:18:46 +01:00 |
|
Lionel VESSILLER
|
ef10a32069
|
Fix authorize long references in Beluga PDF model (uses Landscape mode)
|
2019-03-05 11:18:44 +01:00 |
|
Laurent Destailleur
|
4a582485b9
|
Debug module ticket
|
2019-03-04 19:19:09 +01:00 |
|
Laurent Destailleur
|
0d49f27831
|
Code style
|
2019-03-04 17:36:45 +01:00 |
|
Laurent Destailleur
|
68bb95079a
|
Ignore 2 rules
|
2019-03-04 17:36:03 +01:00 |
|
Laurent Destailleur
|
69794f5293
|
Fix phpcs
|
2019-03-04 17:31:50 +01:00 |
|
Laurent Destailleur
|
d8259f94e1
|
Work on BOM module
|
2019-03-04 13:40:16 +01:00 |
|
Laurent Destailleur
|
925def5390
|
Work on BOM module
|
2019-03-04 13:37:00 +01:00 |
|
Laurent Destailleur
|
7b7ff33fdf
|
Work on BOM module
|
2019-03-04 13:30:43 +01:00 |
|
Laurent Destailleur
|
1c775b7b68
|
Work of BOM module
|
2019-03-04 12:46:07 +01:00 |
|
Laurent Destailleur
|
481d0de010
|
FIX Import of service was not available in update mode
|
2019-03-03 13:02:20 +01:00 |
|
Frédéric FRANCE
|
3037e4a157
|
Update DolibarrModules.class.php
|
2019-03-02 20:49:53 +01:00 |
|
Laurent Destailleur
|
8fce6e5e31
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
|
2019-03-02 19:13:37 +01:00 |
|
Laurent Destailleur
|
40e923ec85
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/modules/modAgenda.class.php
|
2019-03-02 19:07:14 +01:00 |
|
Laurent Destailleur
|
8f8aaf1e8c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-02 19:05:51 +01:00 |
|
Laurent Destailleur
|
4f9981063f
|
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
|
2019-03-02 18:26:50 +01:00 |
|
Laurent Destailleur
|
5f6ca1119a
|
Replace arrow picto with fontawesome
|
2019-03-02 14:07:13 +01:00 |
|
Frédéric FRANCE
|
014f69850e
|
add visibility
|
2019-03-01 23:08:57 +01:00 |
|
Frédéric FRANCE
|
c5c27fdb77
|
add visibility
|
2019-03-01 19:24:06 +01:00 |
|
Frédéric FRANCE
|
bd2e541fd6
|
add visibility
|
2019-03-01 18:28:51 +01:00 |
|
Frédéric FRANCE
|
796ea6f4ea
|
add visibility
|
2019-02-28 23:19:58 +01:00 |
|
Frédéric FRANCE
|
0022c4fe72
|
add visibility
|
2019-02-28 22:44:12 +01:00 |
|
Frédéric FRANCE
|
7e31ca48d8
|
add visibility
|
2019-02-28 22:07:48 +01:00 |
|
Frédéric FRANCE
|
4f9e35f350
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-28 20:48:23 +01:00 |
|
Frédéric FRANCE
|
92c5c15033
|
add visibility
|
2019-02-28 20:48:07 +01:00 |
|
Marc de Lima Lucio
|
b96ac794e9
|
FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work
|
2019-02-28 16:15:32 +01:00 |
|
Laurent Destailleur
|
cefaeb583f
|
Update xinputfile.modules.php
|
2019-02-28 11:24:43 +01:00 |
|
Laurent Destailleur
|
85d46a5270
|
Update xinputfile.modules.php
|
2019-02-28 11:24:07 +01:00 |
|
Laurent Destailleur
|
b8b55fb748
|
WIP Add IFTTT module
|
2019-02-28 10:30:27 +01:00 |
|
gauthier
|
1237a6d3e9
|
FIX : same thing here
|
2019-02-27 14:58:10 +01:00 |
|
gauthier
|
49e03b009f
|
FIX : if empty error message, we just see "error" displayed
|
2019-02-27 14:50:01 +01:00 |
|
Frédéric FRANCE
|
5a4ac82880
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-27 08:23:29 +01:00 |
|
Laurent Destailleur
|
58e2901d14
|
Fix phpcs
|
2019-02-27 00:54:07 +01:00 |
|
Frédéric FRANCE
|
8b4e920d5e
|
add visibility
|
2019-02-26 22:42:19 +01:00 |
|
Frédéric FRANCE
|
5016bc7188
|
wip
|
2019-02-26 21:48:21 +01:00 |
|
Frédéric FRANCE
|
81f2f99db5
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-26 21:16:01 +01:00 |
|
Frédéric FRANCE
|
e6c3eb0ba1
|
wip
|
2019-02-26 21:13:07 +01:00 |
|
Laurent Destailleur
|
9e82c37963
|
WIP Start module BOM
|
2019-02-26 19:27:04 +01:00 |
|
Laurent Destailleur
|
3a2a1b4a56
|
Debug module ticket
|
2019-02-26 13:43:09 +01:00 |
|
Frédéric FRANCE
|
675a17a74c
|
wip
|
2019-02-26 00:34:43 +01:00 |
|
Frédéric FRANCE
|
346d1f410c
|
wip
|
2019-02-25 23:15:48 +01:00 |
|
Frédéric FRANCE
|
915841eeb9
|
wip
|
2019-02-25 22:50:19 +01:00 |
|
Frédéric FRANCE
|
c89e4d79b8
|
wip
|
2019-02-25 22:27:04 +01:00 |
|
Frédéric FRANCE
|
1c07006015
|
wip
|
2019-02-25 21:36:27 +01:00 |
|
Cristian Torres
|
c781eeb17d
|
[FIX] ORDER BY before custom filters for where
When filtering data "and cac.libelle" would be appended after ORDER BY
|
2019-02-24 20:55:27 +01:00 |
|
Laurent Destailleur
|
dfd6a0feaa
|
Merge pull request #10643 from tony13tv/patch-3
[FIX] ORDER BY before custom filters for where
|
2019-02-24 20:55:01 +01:00 |
|
Laurent Destailleur
|
89087473e1
|
Merge pull request #10674 from frederic34/patch-4
Update printgcp.modules.php
|
2019-02-24 20:44:08 +01:00 |
|
Frédéric FRANCE
|
e7706192b5
|
doc comment
|
2019-02-24 10:08:42 +01:00 |
|
Frédéric FRANCE
|
b51432790f
|
Update printgcp.modules.php
|
2019-02-24 09:39:48 +01:00 |
|
Frédéric FRANCE
|
485431a722
|
Update printgcp.modules.php
|
2019-02-24 09:31:19 +01:00 |
|
Laurent Destailleur
|
4da1bef6dc
|
Merge pull request #10654 from ptibogxiv/patch-125
FIX Stripe live Oauth
|
2019-02-23 14:21:25 +01:00 |
|
ptibogxiv
|
dd160a6242
|
Create stripelive_oauthcallback.php
|
2019-02-22 14:56:39 +01:00 |
|
Philippe GRAND
|
5a88930062
|
fix : The property total_vat does not exist on Reception
|
2019-02-21 14:38:12 +01:00 |
|
Cristian Torres
|
31aa3ec376
|
[FIX] ORDER BY before custom filters for where
When filtering data "and cac.libelle" would be appended after ORDER BY
|
2019-02-20 11:45:07 -06:00 |
|
Regis Houssin
|
1c3541295b
|
FIX wrong class name "CUnits instead CMeasuringUnits"
|
2019-02-19 09:24:30 +01:00 |
|
Laurent Destailleur
|
ebfb6beee3
|
Merge
|
2019-02-18 19:14:42 +01:00 |
|
Laurent Destailleur
|
e6e18ff616
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
|
2019-02-14 15:33:17 +01:00 |
|
Laurent Destailleur
|
89050da856
|
Merge
|
2019-02-14 15:27:31 +01:00 |
|
Laurent Destailleur
|
afc612c2cb
|
Merge pull request #10592 from frederic34/patch-30
Update mod_expensereport_sand.php
|
2019-02-14 13:32:00 +01:00 |
|
Laurent Destailleur
|
418bab3214
|
Merge pull request #10591 from frederic34/patch-29
Update mod_payment_ant.php
|
2019-02-14 13:31:51 +01:00 |
|
Laurent Destailleur
|
a655481adb
|
Merge pull request #10590 from frederic34/patch-28
Update mod_ticket_universal.php
|
2019-02-14 13:31:33 +01:00 |
|
Laurent Destailleur
|
cd9bd26267
|
Merge pull request #10589 from frederic34/patch-27
Update mod_facture_mercure.php
|
2019-02-14 13:31:15 +01:00 |
|
Laurent Destailleur
|
b69a416960
|
Merge pull request #10588 from frederic34/patch-24
Update mod_commande_fournisseur_orchidee.php
|
2019-02-14 13:29:15 +01:00 |
|
Laurent Destailleur
|
7e4a4c2ae6
|
Merge pull request #10587 from frederic34/patch-23
Update mod_holiday_immaculate.php
|
2019-02-14 13:28:56 +01:00 |
|
Laurent Destailleur
|
c45ed24342
|
Merge pull request #10586 from frederic34/patch-22
Update modules_holiday.php
|
2019-02-14 13:28:30 +01:00 |
|
Laurent Destailleur
|
3050366372
|
Fix table of units already exists. Merge duplicate c_measuring_units
with c_units.
|
2019-02-14 13:02:44 +01:00 |
|
Regis Houssin
|
359318392f
|
FIX missing entity filter in function "build_filterField()" (export)
|
2019-02-14 10:47:07 +01:00 |
|
Frédéric FRANCE
|
6276845956
|
Update mod_expensereport_sand.php
|
2019-02-13 23:48:44 +01:00 |
|
Frédéric FRANCE
|
1e52ef19a5
|
Update mod_payment_ant.php
|
2019-02-13 23:45:28 +01:00 |
|
Frédéric FRANCE
|
423a69ffad
|
Update mod_ticket_universal.php
|
2019-02-13 23:44:06 +01:00 |
|
Frédéric FRANCE
|
210fb2eac1
|
Update mod_facture_mercure.php
|
2019-02-13 23:41:47 +01:00 |
|
Frédéric FRANCE
|
5c50ea8afe
|
Update mod_commande_fournisseur_orchidee.php
The property db does not exist on mod_commande_fournisseur_orchidee
|
2019-02-13 23:39:02 +01:00 |
|
Frédéric FRANCE
|
9370c8b3f6
|
Update mod_holiday_immaculate.php
|
2019-02-13 23:36:16 +01:00 |
|
Frédéric FRANCE
|
e0843e6130
|
Update modules_holiday.php
|
2019-02-13 23:35:44 +01:00 |
|
Laurent Destailleur
|
a689f8dc3f
|
Code comment
|
2019-02-13 23:34:28 +01:00 |
|
florian HENRY
|
d88475c61a
|
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
|
2019-02-13 08:59:18 +01:00 |
|
Laurent Destailleur
|
0d8447ad39
|
Merge branch 'develop' of https://github.com/wdammak/dolibarr into
wdammak-develop
# Conflicts:
# htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
|
2019-02-12 16:58:55 +01:00 |
|
florian HENRY
|
5b5f96bafb
|
NEW : measuring unit dictionnary and product size/unit import
|
2019-02-12 16:58:11 +01:00 |
|
Laurent Destailleur
|
205152501e
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
|
2019-02-12 13:39:39 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
Laurent Destailleur
|
b1088f556f
|
Merge pull request #10536 from grandoc/new_branch_09_02_2019
language internationalization
|
2019-02-12 13:28:56 +01:00 |
|
Laurent Destailleur
|
a62bccaf24
|
Fix phpcs
|
2019-02-11 19:19:05 +01:00 |
|
Laurent Destailleur
|
f0e56abac7
|
NEW Module ticket is available as a stable module
|
2019-02-11 19:16:37 +01:00 |
|
Laurent Destailleur
|
c095f802dd
|
Dolibarrize module ticket
|
2019-02-11 14:51:59 +01:00 |
|
Frédéric FRANCE
|
152d8ffcbf
|
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-10 11:08:59 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Philippe Grand
|
92ec149fb6
|
Update modules_fichinter.php
|
2019-02-09 11:05:52 +01:00 |
|
Philippe GRAND
|
869f59de96
|
language internationalization
|
2019-02-09 10:56:59 +01:00 |
|
Laurent Destailleur
|
7625eb7cd4
|
Fix missing error management after afterPDFCreation hook.
Removed dead code
|
2019-02-08 19:54:24 +01:00 |
|
Laurent Destailleur
|
a916708068
|
Fix missing disable dependency
|
2019-02-08 19:01:47 +01:00 |
|
Laurent Destailleur
|
ed733fb82d
|
Fix phpcs
|
2019-02-08 13:28:10 +01:00 |
|
Laurent Destailleur
|
8760b1e592
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-08 12:57:50 +01:00 |
|
Laurent Destailleur
|
27da574e38
|
Fix phpcs
|
2019-02-08 12:36:33 +01:00 |
|
Laurent Destailleur
|
1611c613f5
|
Fix phpcs
|
2019-02-08 12:19:51 +01:00 |
|
Laurent Destailleur
|
ec686a8f79
|
Fix phpcs
|
2019-02-08 11:30:20 +01:00 |
|
Laurent Destailleur
|
38d4284638
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
|
2019-02-08 11:26:08 +01:00 |
|
Laurent Destailleur
|
fe1188c4ea
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/filefunc.inc.php
|
2019-02-08 10:44:45 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Laurent Destailleur
|
6a4a92510d
|
Code comment
|
2019-02-07 13:32:05 +01:00 |
|
atm-ph
|
8e6a567b09
|
Fix display payment table on multiple pages
|
2019-02-07 12:36:22 +01:00 |
|
Frédéric FRANCE
|
e1e14ae6e6
|
wip
|
2019-02-03 22:58:56 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
57f81217ee
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
|
2019-02-03 21:14:44 +01:00 |
|
Laurent Destailleur
|
4d41b1b33c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-03 19:45:45 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
f8b10e9c3d
|
Doxygen
|
2019-02-03 18:47:55 +01:00 |
|
Frédéric FRANCE
|
273d68381c
|
psr2 end file new line none found
|
2019-02-03 15:21:21 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Laurent Destailleur
|
75845a990f
|
FIX Missing province in export of invoice
|
2019-02-01 22:55:28 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Laurent Destailleur
|
6de732d7f8
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
|
2019-02-01 16:07:18 +01:00 |
|
Laurent Destailleur
|
35f65a571c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
|
2019-02-01 16:05:43 +01:00 |
|
Laurent Destailleur
|
dee2a373c1
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2019-02-01 16:01:18 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
Laurent Destailleur
|
4254ad0d33
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-31 15:51:54 +01:00 |
|
Laurent Destailleur
|
14dea53700
|
FIX Missing field in import/export of users
|
2019-01-31 15:51:02 +01:00 |
|
gauthier
|
09ba059c21
|
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-01-31 11:03:06 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
97248a830b
|
FIX #10440
|
2019-01-30 16:28:37 +01:00 |
|
Laurent Destailleur
|
6d992a6d7b
|
FIX #10440
|
2019-01-30 16:24:27 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Laurent Destailleur
|
c354656b1b
|
Merge pull request #10449 from ptibogxiv/patch-108
NEW : list of stripe's payout
|
2019-01-30 15:02:27 +01:00 |
|
Laurent Destailleur
|
60fa8d08c2
|
Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import
FIX: FEC Compatibility for import in ledger
|
2019-01-30 15:01:02 +01:00 |
|
Alexandre SPANGARO
|
84ecfd96fb
|
Update example
|
2019-01-30 11:22:01 +01:00 |
|
Alexandre SPANGARO
|
1b675ba0b6
|
FIX: FEC Compatibility for import in ledger
|
2019-01-30 09:51:29 +01:00 |
|
ptibogxiv
|
a3b648824a
|
ADD payout link
|
2019-01-29 14:12:35 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
77747ac2a3
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-28 16:35:12 +01:00 |
|
Frédéric FRANCE
|
764a928cd6
|
wip
|
2019-01-27 23:48:36 +01:00 |
|
Frédéric FRANCE
|
ff39491f15
|
wip
|
2019-01-27 23:31:37 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
46bc078481
|
Fix phpcs
|
2019-01-27 23:10:10 +01:00 |
|