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
|
c44a5ede43
|
FIX Several problem with the last event box on project/tasks
Conflicts:
htdocs/core/lib/functions2.lib.php
|
2017-09-13 15:16:06 +02:00 |
|
Laurent Destailleur
|
6e3174e71a
|
Fix menu to member cards generation page was lost.
|
2017-09-12 17:36:19 +02:00 |
|
atm-ph
|
30eb03af4c
|
Fix get_class(self) instead of get_class($this)
|
2017-09-12 16:36:14 +02:00 |
|
Regis Houssin
|
e038e1a2f5
|
Fix: missing select2 combobox
|
2017-09-12 09:27:59 +02:00 |
|
Laurent Destailleur
|
44405e5415
|
Fix #7335 #7365 Better fix
|
2017-09-11 15:04:29 +02:00 |
|
Laurent Destailleur
|
029f1c411f
|
Merge pull request #7357 from hregis/6.0_medias
Fix: some problems with medias in multicompany
|
2017-09-11 14:13:51 +02:00 |
|
Laurent Destailleur
|
19e780c53f
|
Merge pull request #7346 from hregis/6.0_bug3
Fix: avoid warning
|
2017-09-11 14:07:38 +02:00 |
|
Laurent Destailleur
|
61a0f04bbe
|
FIX dateSelector was not taken into account
|
2017-09-11 03:30:45 +02:00 |
|
Laurent Destailleur
|
214bad26db
|
Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and
timezone > 0
|
2017-09-11 03:30:10 +02:00 |
|
Laurent Destailleur
|
e9e6a8e5ad
|
Fix center of button
|
2017-09-11 03:29:36 +02:00 |
|
Laurent Destailleur
|
d13c4b7b84
|
Better autosize of extrafields
|
2017-09-11 01:05:55 +02:00 |
|
Regis Houssin
|
762b4eb876
|
Fix: some problems with medias in multicompany
|
2017-09-09 17:48:04 +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
|
03fe9d4e97
|
Escape all status
|
2017-09-08 13:23:12 +02:00 |
|
Regis Houssin
|
d4c20a919d
|
Fix: avoid warning
|
2017-09-08 12:52:56 +02:00 |
|
Laurent Destailleur
|
f92eded0a2
|
Merge pull request #7340 from Oeris/6.0-ficheinter
NEW Adds an option to hide duration in the "intervention" module
|
2017-09-07 18:07:14 +02:00 |
|
Laurent Destailleur
|
faaebbf5e1
|
Merge pull request #7336 from hregis/6.0_bug3
Fix: avoid "Uncaught Error: [] operator not supported for strings"
|
2017-09-07 18:04:08 +02:00 |
|
Laurent Destailleur
|
bde293af22
|
Fix filter on extrafield with type sellist
|
2017-09-07 15:34:25 +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
|
33e2179b65
|
FIX SQL injection
|
2017-09-06 18:17:57 +02:00 |
|
Laurent Destailleur
|
d26b2a694d
|
FIX Security fixes (filter onload js, less verbose error message in
download and viewimage, show info to encourage dolibarr_main_prod=1)
|
2017-09-06 11:39:30 +02:00 |
|
Regis Houssin
|
9b35793608
|
Fix: avoid "Uncaught Error: [] operator not supported for strings"
|
2017-09-06 11:08:23 +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 |
|
Laurent Destailleur
|
61ee071f43
|
Fix regression
|
2017-09-04 10:17:51 +02:00 |
|
Laurent Destailleur
|
2c3a696b78
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-09-04 10:16:02 +02:00 |
|
Laurent Destailleur
|
f3b1f89bae
|
Fix warning
|
2017-09-03 15:21:37 +02:00 |
|
Laurent Destailleur
|
3126676ffb
|
FIX inert of extra field must not change extrafield values in memory
|
2017-09-03 14:27:46 +02:00 |
|
Laurent Destailleur
|
4660bc58fc
|
Fix nostop option
|
2017-09-01 17:08:47 +02:00 |
|
Laurent Destailleur
|
223e1b1cd4
|
Fix missing the nostop tag
|
2017-09-01 16:55:09 +02:00 |
|
Laurent Destailleur
|
2768878618
|
FIX Bad condition on sms log debug
|
2017-09-01 16:39:49 +02:00 |
|
Maxime Kohlhaas
|
cf49c274a6
|
Better fix
|
2017-09-01 10:38:50 +02:00 |
|
Maxime Kohlhaas
|
1a956cce9a
|
Fix : insert line extrafield
|
2017-09-01 10:31:22 +02:00 |
|
Laurent Destailleur
|
e71409b7c8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-08-30 17:15:28 +02:00 |
|
Laurent Destailleur
|
0a67ca53d4
|
Fix menu auguria
|
2017-08-30 17:14:54 +02:00 |
|
Laurent Destailleur
|
b65db49868
|
Merge pull request #7309 from simnandez/6.0
NEW Add detail of all tax rates into pdf column tax sale.
|
2017-08-30 16:47:42 +02:00 |
|
Laurent Destailleur
|
a3085cb44a
|
Update objectline_view.tpl.php
|
2017-08-30 16:43:57 +02:00 |
|
Laurent Destailleur
|
70cbaeb423
|
Fix mass merging must read only PDF generated for REF.
|
2017-08-30 16:10:39 +02:00 |
|
Juanjo Menent
|
d5a9d32778
|
Merge remote-tracking branch 'upstream/6.0' into 6.0
|
2017-08-30 14:37:43 +02:00 |
|
Juanjo Menent
|
bfc5f01e1e
|
NEW Add detail of all tax rates into pdf column tax sale.
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
|
2017-08-30 14:36:00 +02:00 |
|
Laurent Destailleur
|
d3c95e030b
|
Fix delete file not possible for external user even with permissions
|
2017-08-30 14:34:36 +02:00 |
|
Laurent Destailleur
|
991a33f7b6
|
Make different vat rates visible
|
2017-08-29 20:40:51 +02:00 |
|
Laurent Destailleur
|
6c202c5fa1
|
Fix vat rate to show and not vat amount
|
2017-08-29 19:55:49 +02:00 |
|
Laurent Destailleur
|
dabd882056
|
Use a slash
|
2017-08-29 17:24:49 +02:00 |
|
Laurent Destailleur
|
e862ba9daf
|
NEW Add detail of all tax rates into pdf column tax sale.
|
2017-08-29 17:22:03 +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
|
eebaff95cf
|
Fix pb with imagick
|
2017-08-29 13:41:44 +02:00 |
|
Laurent Destailleur
|
22ca29a51f
|
Fix sql syntax error
|
2017-08-29 13:32:25 +02:00 |
|
Laurent Destailleur
|
075a138e14
|
Fix substitution of __EMAIL__
|
2017-08-28 12:49:57 +02:00 |
|
Laurent Destailleur
|
73a799b0ce
|
Merge pull request #7297 from hregis/6.0_bug2
Fix: use resprint instead resarray
|
2017-08-28 12:27:26 +02:00 |
|
Laurent Destailleur
|
21a7fcb01a
|
Fix substitution when sending emails
|
2017-08-28 12:18:18 +02:00 |
|
Regis Houssin
|
0ce51fcb87
|
Fix: add resprint for passwordforgotten
|
2017-08-28 09:14:50 +02:00 |
|
Regis Houssin
|
570c683b99
|
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug2
|
2017-08-28 09:02:51 +02:00 |
|
Laurent Destailleur
|
1f64f9dfcc
|
Merge pull request #7303 from hregis/6.0_background
Fix: better for responsive background image
|
2017-08-28 08:58:54 +02:00 |
|
Regis Houssin
|
b3642708b3
|
Fix: better for responsive background image
|
2017-08-28 08:28:58 +02:00 |
|
Laurent Destailleur
|
c382ca22b8
|
FIX link in to email and option for tls
|
2017-08-28 00:09:21 +02:00 |
|
Regis Houssin
|
80af01c20f
|
Fix: wrong test
|
2017-08-27 13:57:52 +02:00 |
|
Regis Houssin
|
526ccc870b
|
Fix: add compatibility with old modules
|
2017-08-27 13:53:08 +02:00 |
|
Regis Houssin
|
1ce1899a46
|
Fix: add comment
|
2017-08-27 13:42:46 +02:00 |
|
Regis Houssin
|
896c8b4a78
|
Fix: comment old code
|
2017-08-27 13:24:29 +02:00 |
|
Regis Houssin
|
d800d10766
|
Fix: use resprint instead resarray
|
2017-08-27 13:19:57 +02:00 |
|
Laurent Destailleur
|
08da8ef09d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-08-26 21:58:52 +02:00 |
|
Laurent Destailleur
|
4052e15565
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/comm/action/card.php
|
2017-08-26 21:58:29 +02:00 |
|
Laurent Destailleur
|
782b85ba13
|
Merge pull request #7285 from hregis/6.0_bug
Fix: avoid error "A non-numeric value encountered"
|
2017-08-26 19:31:16 +02:00 |
|
Laurent Destailleur
|
98f5fbab5d
|
Fix error on contact/address not linked on thirdparty
|
2017-08-25 13:50:45 +02:00 |
|
Laurent Destailleur
|
d8ead2693f
|
Fix field position
|
2017-08-24 17:59:20 +02:00 |
|
Laurent Destailleur
|
326d3df63f
|
FIX select of category
FIX pb with extrafield list and key '0'
Conflicts:
htdocs/core/class/extrafields.class.php
|
2017-08-24 13:28:56 +02:00 |
|
Regis Houssin
|
982fca541d
|
Fix: (Agenda) Allowed if link to third party is empty
|
2017-08-24 08:33:40 +02:00 |
|
Regis Houssin
|
ad39c30c21
|
Fix: change old email
|
2017-08-23 21:23:18 +02:00 |
|
Regis Houssin
|
7da1b215f3
|
Fix: avoid error "A non-numeric value encountered"
|
2017-08-23 21:01:14 +02:00 |
|
Laurent Destailleur
|
ab37794f61
|
Fix text
|
2017-08-23 19:34:26 +02:00 |
|
Laurent Destailleur
|
ccb5344d32
|
Fix links
|
2017-08-23 18:52:03 +02:00 |
|
Laurent Destailleur
|
f3ef6448d7
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
|
2017-08-23 16:11:51 +02:00 |
|
Laurent Destailleur
|
4da49dfc2d
|
FIX #7239
|
2017-08-23 15:02:38 +02:00 |
|
Laurent Destailleur
|
e25a428118
|
Fix compatibility with Internet Explorer
|
2017-08-23 12:32:28 +02:00 |
|
Laurent Destailleur
|
aae24c26a3
|
Some fixes with smartphones
|
2017-08-22 20:20:34 +02:00 |
|
Laurent Destailleur
|
ca3b3b9843
|
Merge pull request #7270 from atm-florian/6.0_fix
6.0 fix
|
2017-08-22 10:33:08 +02:00 |
|
Laurent Destailleur
|
9ffcd9e922
|
Fix cover background size
|
2017-08-21 21:18:07 +02:00 |
|
Laurent Destailleur
|
68c31c55c5
|
FIX delete dir when there is symlinks
|
2017-08-21 01:26:22 +02:00 |
|
Laurent Destailleur
|
ac3a270e17
|
FIX Do not delete files into sym links
Conflicts:
htdocs/core/lib/files.lib.php
|
2017-08-21 00:43:52 +02:00 |
|
florian HENRY
|
874d61bb6d
|
Other fix
|
2017-08-18 11:35:20 +02:00 |
|
florian HENRY
|
c793e847bc
|
fix comondoc generator
|
2017-08-18 11:30:13 +02:00 |
|
Laurent Destailleur
|
744f0ab198
|
Merge remote-tracking branch 'origin/5.0' into 6.0
|
2017-08-17 22:03:26 +02:00 |
|
Juanjo Menent
|
3330f040ba
|
FIX: Bad tax calculation with expense report
|
2017-08-16 11:19:28 +02:00 |
|
Laurent Destailleur
|
d37d1a033a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/core/lib/admin.lib.php
htdocs/install/mysql/migration/repair.sql
|
2017-08-11 19:56:17 +02:00 |
|
Laurent Destailleur
|
fd38a55f51
|
FIX amount overlap other amount when a pagebreak is done due to an image
at the bottom of page.
|
2017-08-07 15:49:54 +02:00 |
|
Laurent Destailleur
|
975fd0a6d3
|
Fix font size
|
2017-08-07 15:43:42 +02:00 |
|
Laurent Destailleur
|
1c157c7c3d
|
Fix pb with mix collation. Add a way to fix this in repair.
|
2017-08-04 21:23:40 +02:00 |
|
Laurent Destailleur
|
7c840b8348
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-08-04 15:32:30 +02:00 |
|
Laurent Destailleur
|
a7dda865c9
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-08-04 15:29:54 +02:00 |
|
Laurent Destailleur
|
a3beceade2
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-08-04 15:28:55 +02:00 |
|
Laurent Destailleur
|
8a71b9e95e
|
Avoid creation of dir that is not indexed
|
2017-08-04 13:51:25 +02:00 |
|
Laurent Destailleur
|
da831d2c8e
|
FIX Bad link in ECM
|
2017-08-04 13:45:57 +02:00 |
|
Laurent Destailleur
|
3a098ca047
|
Reduce verbosity
|
2017-08-04 11:50:30 +02:00 |
|
Laurent Destailleur
|
a8e2f95c39
|
Better help
|
2017-08-03 10:47:35 +02:00 |
|
Laurent Destailleur
|
2a92ee6008
|
Fix look and feel v6
|
2017-08-02 14:10:43 +02:00 |
|
Laurent Destailleur
|
5b1f5b0f20
|
Fix translation done twice into field title of array
|
2017-08-02 13:31:53 +02:00 |
|
Laurent Destailleur
|
33d6903d3f
|
Fix bad recipient when using mass actions
|
2017-08-02 11:39:11 +02:00 |
|
Ferran Marcet
|
09c271b7c5
|
Fix: Correction in the calculation of the next week
|
2017-08-02 10:31:16 +02:00 |
|
Laurent Destailleur
|
71d49f1c6f
|
Fix pb in ecm
|
2017-08-01 18:44:34 +02:00 |
|
Laurent Destailleur
|
f9dc628f0b
|
Add tool to fix missing thumbs
|
2017-08-01 15:53:22 +02:00 |
|
Laurent Destailleur
|
03b3f54c2c
|
Fix class not found
|
2017-08-01 13:10:15 +02:00 |
|
Laurent Destailleur
|
7d6d4adcdb
|
Fix combo for multicompany not visible where there is other hooks by
other modules
|
2017-07-31 18:16:41 +02:00 |
|
Laurent Destailleur
|
9cf6c43f8a
|
Fix code comment
|
2017-07-31 15:51:08 +02:00 |
|
Laurent Destailleur
|
7ba5cf5958
|
Debug view of services lines
|
2017-07-31 13:48:00 +02:00 |
|
Laurent Destailleur
|
800aa4d5b6
|
Fix bad target
|
2017-07-31 04:49:54 +02:00 |
|
Laurent Destailleur
|
7a69df08c5
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/cron/class/cronjob.class.php
|
2017-07-31 02:39:42 +02:00 |
|
Laurent Destailleur
|
d8121c133e
|
Merge pull request #7205 from atm-quentin/6.0
FIX invoice situation division by zero
|
2017-07-31 02:23:37 +02:00 |
|
Laurent Destailleur
|
bb8d458468
|
Fix menu editor
|
2017-07-30 19:41:45 +02:00 |
|
Laurent Destailleur
|
5e17c2efb9
|
Fix into filters of time consumed
|
2017-07-28 23:32:55 +02:00 |
|
Laurent Destailleur
|
25c5ed8f72
|
Fix for compatibility
|
2017-07-28 18:09:38 +02:00 |
|
Laurent Destailleur
|
ef3c002144
|
Module website not stable enough
|
2017-07-28 12:37:52 +02:00 |
|
Laurent Destailleur
|
f9442c1092
|
Fix box activity
|
2017-07-28 11:11:20 +02:00 |
|
Laurent Destailleur
|
60493d0a47
|
Several fixes (permission, missing method or class) in REST APIs
|
2017-07-28 11:03:30 +02:00 |
|
Laurent Destailleur
|
bdfb0b7561
|
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
|
2017-07-26 21:22:53 +02:00 |
|
Laurent Destailleur
|
7e0a165131
|
Fix some pb in search using phone
|
2017-07-26 20:33:25 +02:00 |
|
atm-quentin
|
8451ba1f14
|
FIX invoice situation division by zero
|
2017-07-26 14:43:10 +02:00 |
|
Laurent Destailleur
|
ab72fbffc6
|
Fix pb with .svg files
|
2017-07-25 23:02:14 +02:00 |
|
Laurent Destailleur
|
c386a02889
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/langs/en_US/stocks.lang
|
2017-07-25 21:10:08 +02:00 |
|
Laurent Destailleur
|
8b793a261f
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
|
2017-07-25 21:08:31 +02:00 |
|
Laurent Destailleur
|
6a3add6e57
|
Merge pull request #7196 from hregis/6.0_bug
Fix: translation error
|
2017-07-25 13:33:18 +02:00 |
|
florian HENRY
|
d6d454edc8
|
fix : Various misspelling class (eclipse Oxygen standard PHP control)
|
2017-07-25 13:32:27 +02:00 |
|
Laurent Destailleur
|
a7c96416ba
|
Merge pull request #7194 from hregis/6.0_bug2
Fix: getEntity $shared param value is now 1 by default
|
2017-07-25 13:29:42 +02:00 |
|
Laurent Destailleur
|
307b8ef4f6
|
Debug modulebuilder
|
2017-07-25 00:32:06 +02:00 |
|
Laurent Destailleur
|
dcb79e66cc
|
Debug modulebuilder
|
2017-07-24 13:55:12 +02:00 |
|
Regis Houssin
|
88968aae22
|
Fix: translation error
|
2017-07-24 09:10:59 +02:00 |
|
Regis Houssin
|
48800bc268
|
Fix: getEntity $shared param value is now 1 by default
|
2017-07-24 08:52:10 +02:00 |
|
Laurent Destailleur
|
9043cf759b
|
Fix clone function
|
2017-07-23 20:27:30 +02:00 |
|
Laurent Destailleur
|
25b107defb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
|
2017-07-23 19:09:00 +02:00 |
|
Laurent Destailleur
|
0aed9ecd7c
|
Fix ckeditor is now ok since there is no more jmobile.
|
2017-07-23 18:52:30 +02:00 |
|
Laurent Destailleur
|
7904e994a7
|
FIX When disconnected, the search box jump to login instead of error.
|
2017-07-22 23:43:40 +02:00 |
|
Laurent Destailleur
|
9e6666e511
|
Fix translation keys for taxes
|
2017-07-22 16:40:19 +02:00 |
|
Laurent Destailleur
|
340203cc18
|
Fix vat label for India
|
2017-07-22 16:05:51 +02:00 |
|
Laurent Destailleur
|
44023606c6
|
Fix pb in dolGetFirstLineOfText. Add PHPunit
|
2017-07-22 12:47:35 +02:00 |
|
Laurent Destailleur
|
f64a9968a9
|
Debug modulebuilder
|
2017-07-22 01:00:43 +02:00 |
|
Regis Houssin
|
2e63393bf2
|
Fix: wrong values if array used to force entity 0
|
2017-07-21 19:35:08 +02:00 |
|
Laurent Destailleur
|
6830fe4f91
|
Fix generic clone function
|
2017-07-21 13:39:06 +02:00 |
|
Laurent Destailleur
|
3b8f60f90e
|
Fix pb of recursive include in website module
|
2017-07-20 16:49:20 +02:00 |
|
Laurent Destailleur
|
97fe41d603
|
A info int smtp header
|
2017-07-18 12:49:19 +02:00 |
|
Laurent Destailleur
|
2a50a78497
|
Fix hack to solve link to restrictions
|
2017-07-18 10:15:48 +02:00 |
|
Laurent Destailleur
|
e5ec0a785d
|
Fix use command standard @... to mark a change in official code
|
2017-07-17 20:20:38 +02:00 |
|
Laurent Destailleur
|
4582b54e91
|
Fix use command standard @... to mark a change in official code
|
2017-07-17 20:09:19 +02:00 |
|
Laurent Destailleur
|
4fa04247a9
|
Finished dev
|
2017-07-17 11:09:32 +02:00 |
|
Laurent Destailleur
|
d832bfc056
|
Some fix into dol_compress_dir function.
|
2017-07-17 11:05:38 +02:00 |
|
Laurent Destailleur
|
330f3af74d
|
Fix pb in recursive dol_dir_list return.
|
2017-07-17 10:26:36 +02:00 |
|
Laurent Destailleur
|
4d9ae5bb44
|
Work on modulebuilder
|
2017-07-16 14:57:30 +02:00 |
|
Laurent Destailleur
|
7b2a71802b
|
Do some TODO on modulebuilder module.
|
2017-07-16 13:00:35 +02:00 |
|
Laurent Destailleur
|
e5513cff91
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/accountancy/journal/bankjournal.php
|
2017-07-15 21:24:21 +02:00 |
|
Laurent Destailleur
|
4e45c7fdba
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2017-07-15 21:21:40 +02:00 |
|
Laurent Destailleur
|
1735a649e9
|
Fix permission on salary module
|
2017-07-15 13:02:41 +02:00 |
|
Laurent Destailleur
|
0763d15b4c
|
Debug journalization
Debug edition of user BAN.
|
2017-07-15 12:37:31 +02:00 |
|
Laurent Destailleur
|
ab6646d16b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/bank/bankentries.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2017-07-15 03:54:50 +02:00 |
|
Laurent Destailleur
|
de66971d93
|
Fix bad setup
|
2017-07-14 15:49:33 +02:00 |
|
Laurent Destailleur
|
15cf15f47f
|
Look and feel v6
|
2017-07-14 02:07:01 +02:00 |
|
Laurent Destailleur
|
312b153005
|
Fix phpcs
|
2017-07-13 23:46:01 +02:00 |
|
Laurent Destailleur
|
7eb4562432
|
Code comment
|
2017-07-13 15:22:07 +02:00 |
|
Laurent Destailleur
|
43f6eab2ea
|
FIX #7146
|
2017-07-13 15:16:17 +02:00 |
|
Laurent Destailleur
|
c434f72d31
|
Merge pull request #7146 from hregis/6.0_bug3
Fix: travis error (categorie)
|
2017-07-13 14:46:41 +02:00 |
|
Laurent Destailleur
|
85d9a2f790
|
Merge pull request #7145 from hregis/6.0_bug2
Fix: missing group name with dol_banner_tab
|
2017-07-13 14:36:17 +02:00 |
|
Laurent Destailleur
|
bea3ced763
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-07-13 14:32:03 +02:00 |
|
Laurent Destailleur
|
9ca12c9d11
|
Merge pull request #7141 from hregis/6.0
Fix: error during upgrade process
|
2017-07-13 14:28:47 +02:00 |
|
Laurent Destailleur
|
743de4e586
|
FIX Option to classify proposal/order in workflow module must not set
source object to billed if amount differs.
|
2017-07-13 12:42:32 +02:00 |
|
Laurent Destailleur
|
2141cfb282
|
Fix code of triggers (disabled if module not enabled)
|
2017-07-13 11:25:25 +02:00 |
|
Laurent Destailleur
|
9127892c71
|
Fix several minor bugs
|
2017-07-13 02:33:48 +02:00 |
|
Laurent Destailleur
|
23fbef3dae
|
Fix the delete dir functions does not return real nb of deleted files.
|
2017-07-13 00:26:05 +02:00 |
|
Laurent Destailleur
|
44b6b8cc65
|
Fix purge of log files was missing some log files.
|
2017-07-12 20:27:25 +02:00 |
|
Laurent Destailleur
|
a487492a7a
|
Fix purge of log files was missing some log files.
|
2017-07-12 20:23:35 +02:00 |
|
Regis Houssin
|
44a44ab0a2
|
Fix: travis error
|
2017-07-12 16:45:32 +02:00 |
|
Regis Houssin
|
d63e15f0c6
|
Fix: missing group name with dol_banner_tab
|
2017-07-12 15:52:58 +02:00 |
|
Laurent Destailleur
|
33ceb22b8b
|
Fix error management into modulebuilder
|
2017-07-12 13:25:18 +02:00 |
|
Laurent Destailleur
|
40b3ae2a15
|
Debug modulebuilder
|
2017-07-12 11:52:07 +02:00 |
|
Laurent Destailleur
|
11cc1f04c4
|
Work on modulebuilder
|
2017-07-12 01:55:07 +02:00 |
|
Regis Houssin
|
f745c87394
|
Fix: error during upgrade process
|
2017-07-11 21:27:51 +02:00 |
|
Laurent Destailleur
|
c75db29ff2
|
Fix warning when module position is not correct
|
2017-07-11 12:54:49 +02:00 |
|
Laurent Dinclaux
|
64a5be3e00
|
Fixes travis error: Arguments with default values must be at the end of the argument list
|
2017-07-10 14:14:21 +11:00 |
|
Laurent Dinclaux
|
244574f8e6
|
Fixes functions comments
|
2017-07-10 13:19:59 +11:00 |
|
Laurent Dinclaux
|
253f7e252d
|
Fixes local taxes repports by rate
|
2017-07-10 13:15:14 +11:00 |
|
Laurent Destailleur
|
10cb7b2524
|
Fix remove warnings
|
2017-07-09 20:31:27 +02:00 |
|
Laurent Destailleur
|
aa66676b7d
|
Quick hack to solve missing alias name on doc.
|
2017-07-09 15:15:23 +02:00 |
|
Laurent Destailleur
|
45d8fbb19e
|
Fix gravatar
|
2017-07-08 21:39:48 +02:00 |
|
Laurent Destailleur
|
d223283359
|
Fix phpcs
|
2017-07-08 20:59:53 +02:00 |
|
Laurent Destailleur
|
f40afcf023
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
|
2017-07-08 18:32:34 +02:00 |
|
Laurent Destailleur
|
4290be7ee6
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-07-08 18:10:02 +02:00 |
|
Laurent Destailleur
|
ba3b6b6aa5
|
Better support of vat with code in expense report
|
2017-07-08 18:09:45 +02:00 |
|
Laurent Destailleur
|
cf6745b1ae
|
Debug module builder
|
2017-07-08 17:08:07 +02:00 |
|
Laurent Destailleur
|
8db4e91888
|
Debug modulebuilder
|
2017-07-08 15:43:36 +02:00 |
|
Laurent Destailleur
|
2ea7f38d38
|
Fix migration of version that is not a final version
|
2017-07-08 12:48:17 +02:00 |
|
Laurent Destailleur
|
eff4282cc2
|
Clean files
|
2017-07-07 22:19:01 +02:00 |
|
Laurent Destailleur
|
efd292e8f5
|
Merge pull request #7126 from atm-gauthier/FIX_add_contact
FIX : we have to check if contact doesn't already exist on add_contact
|
2017-07-07 20:33:24 +02:00 |
|
Laurent Destailleur
|
1d35c87c18
|
Merge pull request #7125 from aspangaro/6.0-fec3
Fix some problems
|
2017-07-07 20:32:27 +02:00 |
|
Laurent Destailleur
|
bcbd2a8a91
|
Merge pull request #7108 from atm-ph/fix_develop_import_update
Fix update row on xlsx import do not work as csv import
|
2017-07-07 20:00:28 +02:00 |
|
Laurent Destailleur
|
c6fc7313b1
|
Merge pull request #7116 from atm-ph/fix_7109
FIX 7109 - class name already exist for customer payment
|
2017-07-07 19:01:10 +02:00 |
|
Laurent Destailleur
|
252d8da8fc
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2017-07-07 15:11:53 +02:00 |
|
gauthier
|
a6f1e08c19
|
FIX : we have to check if contact doesn't already exist on add_contact() function
|
2017-07-07 11:48:30 +02:00 |
|
Laurent Destailleur
|
9baeee893f
|
Fix multicurrency (tags for odt)
|
2017-07-07 10:54:54 +02:00 |
|
Laurent Destailleur
|
2aaf8b22f2
|
Fix substitution var
|
2017-07-07 10:10:12 +02:00 |
|
Alexandre SPANGARO
|
0c5febfb4d
|
Fix: Accountancy
|
2017-07-07 06:09:49 +02:00 |
|
alexis Algoud
|
3d18c71201
|
FIX invoice situation VAT total rounding into PDF crabe
|
2017-07-05 17:21:37 +02:00 |
|
phf
|
31b94c1d3f
|
Fix 7109 - class name already exist for customer payment
|
2017-07-05 16:52:37 +02:00 |
|
phf
|
3892da7606
|
Fix update row on xlsx import do not work as csv import
|
2017-07-04 12:09:56 +02:00 |
|
Laurent Destailleur
|
77f5952318
|
Fix pgsql compatibility
|
2017-07-04 11:18:48 +02:00 |
|
Laurent Destailleur
|
9e26e6b0a3
|
Fix bad value for ref of old contracts
|
2017-07-03 11:42:17 +02:00 |
|
Laurent Destailleur
|
aa1351d483
|
Fix to be sure database is not created using utf8mb4 (not yet supported)
|
2017-07-03 01:10:09 +02:00 |
|
Laurent Destailleur
|
c56ea50251
|
Currency symbol for peru is before value
|
2017-07-02 14:30:24 +02:00 |
|
Laurent Destailleur
|
53708c138a
|
Add option to be able to debug problem of apache lock page
|
2017-07-01 16:52:28 +02:00 |
|
Laurent Destailleur
|
658fe93d8c
|
Fix menu editor (data not aligned)
|
2017-07-01 12:42:49 +02:00 |
|
Laurent Destailleur
|
b7218c1bcd
|
Fix menu consistency
|
2017-07-01 03:18:17 +02:00 |
|
Laurent Destailleur
|
31fe8ebcee
|
Debug v6
|
2017-07-01 02:22:08 +02:00 |
|
Laurent Destailleur
|
b308cfef1d
|
Fix dol_trunc
|
2017-06-30 18:30:01 +02:00 |
|
Laurent Destailleur
|
ea504a0516
|
FIX We should be able to insert data with value '0' into const
|
2017-06-30 11:10:05 +02:00 |
|
Laurent Destailleur
|
ab0a730d4a
|
Fix bad GETPOST on 'action'
|
2017-06-29 02:54:56 +02:00 |
|
BENKE Charlene
|
b17937ce0d
|
Error fields and add date end on rapport pdf
percentage instead percent
|
2017-06-28 21:29:01 +02:00 |
|
Laurent Destailleur
|
05318bb4ec
|
More complete dol_string_nospecial
|
2017-06-28 19:02:09 +02:00 |
|
Maxime Kohlhaas
|
cef5c0b375
|
Fix column position in PDF when VAT is hidden
|
2017-06-28 00:38:24 +02:00 |
|
Maxime Kohlhaas
|
3664956b8c
|
Update pdf_azur.modules.php
|
2017-06-28 00:31:33 +02:00 |
|
Laurent Destailleur
|
7e6e0ee3a4
|
Fix link to image of MD files
|
2017-06-27 20:02:46 +02:00 |
|
Laurent Destailleur
|
6f82837b0f
|
Fix GETPOST of lang_id
|
2017-06-27 17:27:01 +02:00 |
|
Laurent Destailleur
|
1a860c42ee
|
Look and feel v6
|
2017-06-27 16:42:11 +02:00 |
|
Laurent Destailleur
|
1fafa4017d
|
Fix test on currency name
|
2017-06-27 12:33:29 +02:00 |
|
Laurent Destailleur
|
3b7667292b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-06-27 11:59:40 +02:00 |
|
Laurent Destailleur
|
92287ab18d
|
Fix url suggested for bookmark did not always include params
|
2017-06-27 11:12:03 +02:00 |
|
Laurent Destailleur
|
08af9bf365
|
List before
|
2017-06-27 10:37:00 +02:00 |
|
Laurent Destailleur
|
267170b8d2
|
Fix mainmenu was not correctly set with auguria menu
|
2017-06-27 10:34:41 +02:00 |
|
Laurent Destailleur
|
3fdfebf7ef
|
Fix position of top menu does not follow 'position' field.
|
2017-06-27 04:25:41 +02:00 |
|
Laurent Destailleur
|
2be848025f
|
Fix parameter withcode of currency_name function. Add PHPUnit tests
|
2017-06-26 10:09:22 +02:00 |
|
Laurent Destailleur
|
4a21457b8a
|
Fix position of page nb
|
2017-06-26 09:28:02 +02:00 |
|
Laurent Destailleur
|
63dcdc3a03
|
Fix API was loading definition of all APIs at each call.
|
2017-06-25 17:09:08 +02:00 |
|
BENKE Charlene
|
03cb850442
|
$forceimgscaleheight instead $forceimgscalewidth
|
2017-06-24 20:48:11 +02:00 |
|
Laurent Destailleur
|
b0c5616ff0
|
Fix in the way markdown README and ChangeLog are output on module page.
|
2017-06-24 16:01:18 +02:00 |
|
Laurent Destailleur
|
3b2eb97d72
|
Fix menu position
|
2017-06-24 10:29:07 +02:00 |
|
Laurent Destailleur
|
59bd4749a8
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/class/product.class.php
|
2017-06-24 10:27:10 +02:00 |
|
Laurent Destailleur
|
ee8924e101
|
Fix position of accounting periods
|
2017-06-24 10:23:38 +02:00 |
|
Laurent Destailleur
|
81a473d547
|
Warning not required for the moment
|
2017-06-23 23:40:02 +02:00 |
|
Laurent Destailleur
|
1211e0d7ab
|
FIX vat code not saved during product creation.
|
2017-06-23 12:09:21 +02:00 |
|
Laurent Destailleur
|
693b2fe3b4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture.php
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/tpl/objectline_create.tpl.php
|
2017-06-23 11:20:29 +02:00 |
|
Laurent Destailleur
|
45004493e0
|
Fix multicurrency and vat_src_code not propaged on invoice from
shipment.
|
2017-06-23 11:12:17 +02:00 |
|
Laurent Destailleur
|
3a400c46ad
|
Fix preselected email not done
|
2017-06-23 10:15:32 +02:00 |
|
Laurent Destailleur
|
1b96bb4221
|
Fix usage of constant. No need to have a dedicated setup as it should be
supported by the responsive design architecture.
|
2017-06-22 14:48:13 +02:00 |
|
Laurent Destailleur
|
474a2692fa
|
Fix missing /div
|
2017-06-22 13:54:03 +02:00 |
|
Laurent Destailleur
|
c7a6a67e20
|
Fix remove warnings
|
2017-06-22 11:04:29 +02:00 |
|
Laurent Destailleur
|
06c7cb5d8c
|
Fix css
|
2017-06-22 09:21:32 +02:00 |
|
Laurent Destailleur
|
014cb4b004
|
Fix navigation on security event list
|
2017-06-21 12:03:49 +02:00 |
|
Laurent Destailleur
|
4102403482
|
Look and feel v6
|
2017-06-21 11:37:34 +02:00 |
|
Laurent Destailleur
|
ec9bbe2b52
|
Help/Need debug of some online instances with the log view
|
2017-06-20 16:54:37 +02:00 |
|
Laurent Destailleur
|
3873bc7433
|
Fix bette compatibility with pgsql
|
2017-06-20 15:06:24 +02:00 |
|