Laurent Destailleur
|
a918fd1cf2
|
Merge pull request #7370 from Oeris/6.0-api
NEW Implementation of a Luracast recommandation for the REST api server
|
2017-09-21 11:20:23 +02:00 |
|
Laurent Destailleur
|
21959aec8f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-09-20 17:42:09 +02:00 |
|
Laurent Destailleur
|
68c9d08909
|
Merge pull request #7438 from fappels/6.0_fix_extrafields_copy
FIX extrafields copy situation invoice, shipment and receipt
|
2017-09-20 17:36:48 +02:00 |
|
tysauron
|
e61032a313
|
Bug get socid with old object sosciete
|
2017-09-20 17:35:11 +02:00 |
|
Laurent Destailleur
|
fc5c9ad2f2
|
Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling
Fix batch required for lot product error message.
|
2017-09-20 17:33:05 +02:00 |
|
Laurent Destailleur
|
1daa0204aa
|
Merge pull request #7434 from atm-quentin/6.0
# Fix #for free line select unit was wrong
|
2017-09-20 17:32:08 +02:00 |
|
Regis Houssin
|
77fea1983c
|
Fix: wrong supplier product price id
|
2017-09-20 16:57:38 +02:00 |
|
Laurent Destailleur
|
6a0ef4b561
|
Fix info ot total in direct debit page
|
2017-09-19 19:29:00 +02:00 |
|
Laurent Destailleur
|
f87614e2d3
|
Fix missing translation
|
2017-09-19 19:12:54 +02:00 |
|
fappels
|
ddeca6cc06
|
fix oddeven revert
|
2017-09-19 18:52:27 +02:00 |
|
fappels
|
cec91ae837
|
Fix extrafield copy receipt
|
2017-09-19 18:44:49 +02:00 |
|
fappels
|
13d5471dd0
|
Fix extrafield copy shipment
|
2017-09-19 18:43:00 +02:00 |
|
fappels
|
8123562ded
|
Fix extrafield copy next situation invoice
|
2017-09-19 18:42:29 +02:00 |
|
Laurent Destailleur
|
14e1306b20
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-09-19 17:06:03 +02:00 |
|
Laurent Destailleur
|
f4ddce7274
|
FIX View of timespent for another user
|
2017-09-19 17:05:50 +02:00 |
|
Neil Orley
|
cc7aee6c3e
|
FIX Implementation of a Luracast recommandation for the REST api server (#7370)
|
2017-09-19 16:59:19 +02:00 |
|
Neil Orley
|
d5966f944f
|
FIX Implementation of a Luracast recommandation for the REST api server (#7370)
|
2017-09-19 16:58:09 +02:00 |
|
Neil Orley
|
caf4ca7451
|
FIX Implementation of a Luracast recommandation for the REST api server (#7370)
|
2017-09-19 16:56:27 +02:00 |
|
Neil Orley
|
949eef82f0
|
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api
|
2017-09-19 16:50:55 +02:00 |
|
atm-quentin
|
815d0aff90
|
FIX for free line select unit was wrong
|
2017-09-19 15:10:18 +02:00 |
|
Laurent Destailleur
|
f5bc9c08b1
|
Missing css
|
2017-09-19 11:38:28 +02:00 |
|
Maxime Kohlhaas
|
5018bf1baf
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-09-19 09:13:22 +02:00 |
|
florian HENRY
|
7375afca3e
|
fix : rest API URL
|
2017-09-19 09:03:25 +02:00 |
|
Laurent Destailleur
|
978702d04b
|
Fix false deprecated warning
|
2017-09-19 01:41:57 +02:00 |
|
Laurent Destailleur
|
f936b17d68
|
FIX Protection to avoid to apply credit note discount > remain to pay
|
2017-09-19 00:24:52 +02:00 |
|
Laurent Destailleur
|
9838199de1
|
FIX Sign of amount in origin currency on credit note created from lines
|
2017-09-18 23:53:17 +02:00 |
|
Laurent Destailleur
|
70b11f18b5
|
FIX #7367
|
2017-09-18 16:06:58 +02:00 |
|
Laurent Destailleur
|
c11ff4a18c
|
FIX #7368
|
2017-09-18 15:55:25 +02:00 |
|
Laurent Destailleur
|
aba907d1a8
|
FIX #7420
|
2017-09-18 15:49:21 +02:00 |
|
Laurent Destailleur
|
0c01c7ceba
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-09-18 15:48:18 +02:00 |
|
Laurent Destailleur
|
6ac1b6e82e
|
Fix template
|
2017-09-18 15:48:04 +02:00 |
|
Laurent Destailleur
|
0536d6cbed
|
FIX #7330
|
2017-09-18 15:46:17 +02:00 |
|
Laurent Destailleur
|
278bcfa8da
|
FIX #7148
|
2017-09-18 15:31:22 +02:00 |
|
Laurent Destailleur
|
52ebdcc27f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-09-18 15:25:51 +02:00 |
|
Laurent Destailleur
|
4c97f5514d
|
FIX #7366 renaming table with pgsql
|
2017-09-18 15:25:21 +02:00 |
|
TuxGasy
|
4043141ae3
|
Allow create shipping if STOCK_SUPPORTS_SERVICES option is enabled
|
2017-09-18 14:11:21 +02:00 |
|
florian HENRY
|
31721165b5
|
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0
|
2017-09-18 11:36:45 +02:00 |
|
Maxime Kohlhaas
|
5383df5246
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-09-18 09:58:15 +02:00 |
|
Laurent Destailleur
|
eaee8ee586
|
Fix box activity again
|
2017-09-17 21:30:27 +02:00 |
|
Laurent Destailleur
|
f76b675e09
|
Fix box activity again
|
2017-09-17 21:30:15 +02:00 |
|
Laurent Destailleur
|
99149b5cfe
|
Fix box activity again
|
2017-09-17 21:30:11 +02:00 |
|
Laurent Destailleur
|
196c5c1267
|
Missing translation
|
2017-09-17 20:51:06 +02:00 |
|
Laurent Destailleur
|
2c3428a1bf
|
Fix css
|
2017-09-17 20:48:09 +02:00 |
|
Laurent Destailleur
|
94368accc1
|
Fix activity box
|
2017-09-17 20:37:18 +02:00 |
|
Laurent Destailleur
|
ee774f1bf9
|
FIX Calculation in the activity box
|
2017-09-17 20:20:48 +02:00 |
|
Laurent Destailleur
|
bb73da4c5e
|
Cherry pick
|
2017-09-17 20:20:27 +02:00 |
|
Laurent Destailleur
|
39acb46139
|
Fix multicompany
|
2017-09-17 19:44:59 +02:00 |
|
Laurent Destailleur
|
9e29ea8011
|
FIX Must use pdf format page as default for merging PDF.
|
2017-09-16 18:32:43 +02:00 |
|
Laurent Destailleur
|
97e8974fdf
|
FIX Better protection to no send email when we change limit
|
2017-09-16 13:29:07 +02:00 |
|
Laurent Destailleur
|
279988bd60
|
Remove warning
|
2017-09-16 12:45:54 +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
|
5bb4590348
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-09-16 12:12:18 +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 |
|
Laurent Destailleur
|
058b690e25
|
FIX menu enty when url is external link
|
2017-09-16 09:22:52 +02:00 |
|
Laurent Destailleur
|
8986640a10
|
FIX Responsive
|
2017-09-16 09:16:05 +02:00 |
|
Laurent Destailleur
|
5e4b500b5d
|
Fix signature was changed during insert
|
2017-09-16 02:22:55 +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
|
087e22ab94
|
Fix bad status picto
|
2017-09-16 00:14:39 +02:00 |
|
Laurent Destailleur
|
48ae76e295
|
Fix picto on service
|
2017-09-15 19:13:40 +02:00 |
|
Laurent Destailleur
|
59f644a3e2
|
FIX SEPA recording payment must save one payment in bank per customer
|
2017-09-15 18:39:10 +02:00 |
|
Laurent Destailleur
|
17eec5f9e9
|
Fix look and field for direct debit notes
|
2017-09-15 17:23:41 +02:00 |
|
florian HENRY
|
ff7b542bfa
|
fix : Avoid warning
|
2017-09-15 13:25:54 +02:00 |
|
florian HENRY
|
8b9b99ac40
|
fix : advance target emailing
|
2017-09-15 13:02:49 +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
|
affaec2a6f
|
Fix count into loop
|
2017-09-14 21:35:14 +02:00 |
|
Laurent Destailleur
|
c52e593ea8
|
Fix this->db
|
2017-09-14 21:27:14 +02:00 |
|
Laurent Destailleur
|
5d920be880
|
FIX Upgrade missing on field
|
2017-09-14 16:51:41 +02:00 |
|
Laurent Destailleur
|
062152c723
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-09-14 16:42:19 +02:00 |
|
Laurent Destailleur
|
84359a0078
|
Fix maxlength of fields
|
2017-09-14 16:42:04 +02:00 |
|
Laurent Destailleur
|
42399952ea
|
Update check.php
|
2017-09-14 14:48:44 +02:00 |
|
TuxGasy
|
4bc8773417
|
decode db password if need
|
2017-09-14 13:52:39 +02:00 |
|
Laurent Destailleur
|
9e7108ff60
|
Merge pull request #7395 from tuxgasy/5.0_bug7387
Fix #7387 : filter closed company when create new documents
|
2017-09-14 13:26:03 +02:00 |
|
Laurent Destailleur
|
22b2446c05
|
Update card.php
|
2017-09-14 13:25:01 +02:00 |
|
Laurent Destailleur
|
d9947f2374
|
Update card.php
|
2017-09-14 13:24:24 +02:00 |
|
Laurent Destailleur
|
2de76d733b
|
Update card.php
|
2017-09-14 13:24:01 +02:00 |
|
Laurent Destailleur
|
2798726dba
|
Update card.php
|
2017-09-14 13:23:28 +02:00 |
|
Laurent Destailleur
|
f16d88fd53
|
FIX #7391
|
2017-09-14 13:17:31 +02:00 |
|
Neil Orley
|
69f86fc0af
|
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api
|
2017-09-14 12:25:01 +02:00 |
|
Laurent Destailleur
|
53c73054f4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-09-14 12:19:50 +02:00 |
|
Laurent Destailleur
|
b80b7bbcb9
|
Merge pull request #7384 from atm-ph/fix_6.0_get_class_self
Fix get_class(self) instead of get_class($this)
|
2017-09-14 12:16:16 +02:00 |
|
Laurent Destailleur
|
225d78c767
|
Merge pull request #7383 from inoveaconseil/patch-8
add translation publisher
|
2017-09-14 12:15:32 +02:00 |
|
Laurent Destailleur
|
a38bbdcc05
|
Merge pull request #7382 from hregis/6.0_bug3
Fix: hide bank account field if module disabled
|
2017-09-14 12:14:45 +02:00 |
|
Laurent Destailleur
|
047f01888a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-09-14 12:08:52 +02:00 |
|
Laurent Destailleur
|
f2d092c815
|
Merge pull request #7377 from hregis/6.0_bug2
Fix: missing select2 combobox
|
2017-09-14 12:08:28 +02:00 |
|
Laurent Destailleur
|
8392158ee3
|
Update remisecheque.class.php
|
2017-09-14 12:06:41 +02:00 |
|
Stéphane BERTHELOT
|
93defa5f59
|
Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)
|
2017-09-14 12:06:25 +02:00 |
|
Laurent Destailleur
|
24436b550d
|
Update time.php
|
2017-09-14 12:03:36 +02:00 |
|
arnaud
|
ed8e08b78a
|
FIX time.php crashed without project id in param
|
2017-09-14 12:03:27 +02:00 |
|
TuxGasy
|
f0983353f2
|
Fix #7387 : filter clsed company when create new documents
|
2017-09-14 12:01:35 +02:00 |
|
Laurent Destailleur
|
dbb50d7b16
|
Fix PHP 7.2
|
2017-09-14 11:56:43 +02:00 |
|
Laurent Destailleur
|
2d7916f77d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/core/lib/json.lib.php
|
2017-09-14 11:49:02 +02:00 |
|
Laurent Destailleur
|
7d5dc08a0a
|
Fix PHP7.2
|
2017-09-14 11:47:27 +02:00 |
|
Laurent Destailleur
|
fe1ce5b3ac
|
Fix php 7.2 compatibility
|
2017-09-14 11:44:47 +02:00 |
|
Laurent Destailleur
|
ed013c1b7e
|
Compatibilty php 7.2
|
2017-09-14 10:21:04 +02:00 |
|
Laurent Destailleur
|
d7b84bd35f
|
Fix responsive
|
2017-09-13 22:56:24 +02:00 |
|
Laurent Destailleur
|
fed3165b53
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/core/lib/price.lib.php
|
2017-09-13 21:53:03 +02:00 |
|
Laurent Destailleur
|
6d40f797d2
|
Fix regression
|
2017-09-13 21:50:14 +02:00 |
|
Laurent Destailleur
|
f2cd96b9c0
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
ChangeLog
htdocs/adherents/class/adherent.class.php
htdocs/core/lib/price.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/supplier_proposal/list.php
|
2017-09-13 20:55:22 +02:00 |
|
Laurent Destailleur
|
dc38ec5051
|
Fix regression
|
2017-09-13 20:48:24 +02:00 |
|
Laurent Destailleur
|
38621b622e
|
Fix specimen not complete for multicompany
|
2017-09-13 20:11:51 +02:00 |
|
Laurent Destailleur
|
9b22f046f5
|
FIX multicompany better accuracy in rounding and with revenue stamp.
|
2017-09-13 19:31:32 +02:00 |
|
Laurent Destailleur
|
a5a08006e9
|
FIX multicompany better accuracy in rounding and with revenue stamp.
|
2017-09-13 19:27:21 +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
|
58b49f9a08
|
Fix position of field to avoid errors
|
2017-09-13 17:10:23 +02:00 |
|
Laurent Destailleur
|
3deacaa5c4
|
Fix css pb
|
2017-09-13 17:10:04 +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
|
e11c7a08ea
|
Fix translation
|
2017-09-13 14:24:03 +02:00 |
|
Laurent Destailleur
|
939d33cce7
|
Fix bug reported by scrutinizer
|
2017-09-12 19:12:39 +02:00 |
|
Laurent Destailleur
|
0744b5d91b
|
Fix typo
Conflicts:
htdocs/public/payment/newpayment.php
|
2017-09-12 19:06:47 +02:00 |
|
Neil Orley
|
f68d31d7c5
|
Add of $urlwithroot in the setBaseUrls function, to use Dolibarr external domain name in the configuration file
|
2017-09-12 17:45:02 +02:00 |
|
Laurent Destailleur
|
6e3174e71a
|
Fix menu to member cards generation page was lost.
|
2017-09-12 17:36:19 +02:00 |
|
Laurent Destailleur
|
d572e1ddad
|
Fix duration output
|
2017-09-12 17:30:18 +02:00 |
|
atm-ph
|
30eb03af4c
|
Fix get_class(self) instead of get_class($this)
|
2017-09-12 16:36:14 +02:00 |
|
Inovea Conseil
|
f0e0df2660
|
add translation publisher
translation for modulehelp.php
|
2017-09-12 16:29:06 +02:00 |
|
Regis Houssin
|
cd888a2149
|
Fix: hide bank account field if module disabled
|
2017-09-12 15:13:12 +02:00 |
|
Maxime Kohlhaas
|
0608778b9c
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-09-12 11:00:28 +02:00 |
|
Regis Houssin
|
e038e1a2f5
|
Fix: missing select2 combobox
|
2017-09-12 09:27:59 +02:00 |
|
fappels
|
681c2a67bd
|
Fix batch required for lot product error message.
|
2017-09-11 23:22:44 +02:00 |
|
Laurent Destailleur
|
44405e5415
|
Fix #7335 #7365 Better fix
|
2017-09-11 15:04:29 +02:00 |
|
Laurent Destailleur
|
e9bc5b719d
|
Complete #7361
|
2017-09-11 14:50:00 +02:00 |
|
reeperbahnause
|
2fdad0f11d
|
fix #7361 missing generateDocument function
fix #7361
Function generateDocument was missing for Class Fichinter
|
2017-09-11 14:46:58 +02:00 |
|
Laurent Destailleur
|
6da5a6b82f
|
FIX #7359
Conflicts:
htdocs/fichinter/class/fichinter.class.php
|
2017-09-11 14:43:40 +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
|
206e44431d
|
Merge pull request #7356 from hregis/6.0_upgrade
Fix: missing salaries upgrade reload module
|
2017-09-11 14:09:39 +02:00 |
|
Laurent Destailleur
|
31b5ca17f1
|
Merge pull request #7353 from hregis/6.0_htmlentities
Fix: avoid htmlentities
|
2017-09-11 14:08:37 +02:00 |
|
Laurent Destailleur
|
5a68d69067
|
Merge pull request #7350 from hregis/6.0_bug2
Fix: missing parameters for filter and sort (contact list)
|
2017-09-11 14:07:56 +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
|
e9912c020e
|
Merge pull request #7333 from fappels/4.0_fix_transfer_line_extrafields
FIX transfer of line extrafields from order to invoice
|
2017-09-11 14:06:50 +02:00 |
|
Laurent Destailleur
|
646e8713f2
|
Remove duplicated logs
|
2017-09-11 13:41:40 +02:00 |
|
Laurent Destailleur
|
b87ce172c3
|
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
|
2017-09-11 13:40:34 +02:00 |
|
Neil Orley
|
a300a635d8
|
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api
|
2017-09-11 12:14:09 +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
|
26385fa10d
|
FIX Clean bad parameters when inserting line of template invoice
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
|
2017-09-11 01:06:48 +02:00 |
|
Laurent Destailleur
|
d13c4b7b84
|
Better autosize of extrafields
|
2017-09-11 01:05:55 +02:00 |
|
Laurent Destailleur
|
c315ad7801
|
Fix missing tables into childtables
|
2017-09-10 18:04:13 +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
|
a8fdf0b5ea
|
Fix: missing salaries upgrade reload module
|
2017-09-09 16:49:26 +02:00 |
|
Regis Houssin
|
7404a6cf98
|
Fix: avoid htmlentities
|
2017-09-09 12:15:59 +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 |
|
Regis Houssin
|
c1c75208ec
|
Fix: missing parameters for filter and sort (contact list)
|
2017-09-09 09:46:21 +02:00 |
|
Laurent Destailleur
|
bb53146192
|
Merge pull request #7348 from hregis/6.0_bug2
Fix: missing parameters for filter and sort
|
2017-09-08 21:22:01 +02:00 |
|
Laurent Destailleur
|
23c5b0366f
|
Merge pull request #7344 from atm-florian/6.0_fixphotocateg
6.0 fixphotocateg
|
2017-09-08 21:21:26 +02:00 |
|
Regis Houssin
|
310e912a9d
|
Fix: missing parameters for filter and sort
|
2017-09-08 19:57:59 +02:00 |
|
Laurent Destailleur
|
c498ce3c41
|
FIX journalization for bank journal should not rely on a label.
|
2017-09-08 17:50:39 +02:00 |
|
Laurent Destailleur
|
8b20c5edab
|
FIX Remove warning when using log into syslog
|
2017-09-08 15:46:06 +02:00 |
|
Laurent Destailleur
|
a6a142753a
|
Fix bad label when account not set
|
2017-09-08 15:24:27 +02:00 |
|
Neil Orley
|
17da808325
|
FIX wrong basePath in the swagger view
Behind a reverse proxy the basePath seems to be in http.
Forcing the basePath to DOL_MAIN_URL_ROOT fixes the problem.
|
2017-09-08 14:35:44 +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 |
|
florian HENRY
|
1a389b6faf
|
fix upload photo for categ
|
2017-09-08 10:36:45 +02:00 |
|
florian HENRY
|
34f08ce082
|
fix travis
|
2017-09-08 10:36:11 +02:00 |
|
florian HENRY
|
20ed279489
|
better fix
|
2017-09-08 10:34:38 +02:00 |
|
florian HENRY
|
da2f971345
|
fix upload images on category
|
2017-09-08 10:33:00 +02:00 |
|
Laurent Destailleur
|
835cd43565
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-09-08 10:09:41 +02:00 |
|
Laurent Destailleur
|
7dbd0bd355
|
FIX Some page of admin were not responsive
|
2017-09-08 10:09:22 +02:00 |
|
fappels
|
7c743eb7da
|
Rename $extrafields because already used
|
2017-09-07 21:04:15 +02:00 |
|
Laurent Destailleur
|
863c575580
|
Merge pull request #7342 from simnandez/5.0
FIX: Bad link to unpayed suppliers invoices
|
2017-09-07 18:09: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
|
a97b87d2cd
|
Merge pull request #7337 from fmarcet/6.0
Fix: Credit card field showing too small
|
2017-09-07 18:04:27 +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
|
b9af2d6b97
|
Merge pull request #7331 from simnandez/6.0
FIX: Bad const name
|
2017-09-07 17:57:33 +02:00 |
|
Laurent Destailleur
|
3393947dbc
|
Merge pull request #7329 from Jacques83300/5.0
FIX Add some missing attributes in Adherent:makeSubstitution (type, phone…
|
2017-09-07 17:57:05 +02:00 |
|
Juanjo Menent
|
7648d300b5
|
FIX: Bad link to unpayed suppliers invoices
|
2017-09-07 17:13:48 +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 |
|
Neil Orley
|
b5c30ea679
|
New: Adds an hide duration button in intervention module
Adds a way to set the visibility of the intervention time field from the administration interface of the "intervention" module
|
2017-09-07 11:58:22 +02:00 |
|
Maxime Kohlhaas
|
18cbe31a84
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-09-07 09:10:24 +02:00 |
|
Laurent Destailleur
|
451adb077f
|
Fix upgrade
|
2017-09-06 22:41:29 +02:00 |
|
Laurent Destailleur
|
17310da0f8
|
Fix missing field in some env
|
2017-09-06 21:39:10 +02:00 |
|
Laurent Destailleur
|
33e2179b65
|
FIX SQL injection
|
2017-09-06 18:17:57 +02:00 |
|
Laurent Destailleur
|
032f54dd1a
|
Fix search criteria lost during navigation
|
2017-09-06 15:36:16 +02:00 |
|
Ferran Marcet
|
9fa85a5831
|
Fix: Credit card field showing too small
|
2017-09-06 12:14:42 +02:00 |
|
Ferran Marcet
|
016ed12c11
|
Fix: Credit card field showing too small
|
2017-09-06 12:09:07 +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 |
|
fappels
|
f5e14c9d70
|
Transfer of customer order line extrafield should only transfer fields available in target
|
2017-09-05 21:41:49 +02:00 |
|
fappels
|
237270a27e
|
Add missing transfer of line extrafields in create invoice from supplier order
|
2017-09-05 21:40:04 +02:00 |
|
Laurent Destailleur
|
f5ccd943f1
|
Fix mix of collation
|
2017-09-05 20:13:33 +02:00 |
|
Juanjo Menent
|
53f5513476
|
FIX: Bad const name
|
2017-09-05 18:10:19 +02:00 |
|
Laurent Destailleur
|
e599e47e84
|
Missing translation
|
2017-09-05 13:06:34 +02:00 |
|
Maxime Kohlhaas
|
4638ebac8a
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-09-05 09:46:31 +02:00 |
|
Jacques83300
|
52986c5c07
|
Add some missing attributes in Adherent:makeSubstitution (type, phone numbers) for use in substitution of tags
|
2017-09-04 15:59:50 +02:00 |
|
Laurent Destailleur
|
d4ff877fdd
|
Prepare 6.0.1
|
2017-09-04 12:13:12 +02:00 |
|
Laurent Destailleur
|
d66fac5662
|
Prepare 5.0.7
|
2017-09-04 12:12:50 +02:00 |
|
Laurent Destailleur
|
67b5353861
|
Merge pull request #7327 from marcosgdf/bug-7000
FIX #7000 Dashboard link for late pending payment supplier invoices do not work
|
2017-09-04 10:54:58 +02:00 |
|
Laurent Destailleur
|
4dd58a94f3
|
Update list.php
|
2017-09-04 10:54:50 +02:00 |
|
Laurent Destailleur
|
1154f871f1
|
Update fiche-rec.php
|
2017-09-04 10:52:49 +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 |
|
Marcos García
|
eb9e8c9dfc
|
FIX #7000 Dashboard link for late pending payment supplier invoices do not work
Close #7000
|
2017-09-03 12:42:05 +02:00 |
|
Marcos García
|
ac7f1035e1
|
FIX #7325 Default VAT rate when editing template invoices is 0%
Close #7325
|
2017-09-03 12:25:27 +02:00 |
|
Laurent Destailleur
|
3108f5bf0d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-09-03 01:00:30 +02:00 |
|
Laurent Destailleur
|
c108f11c01
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
build/makepack-dolibarr.pl
htdocs/compta/bank/index.php
|
2017-09-03 00:58:45 +02:00 |
|
Laurent Destailleur
|
09e9254f35
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-09-02 01:29:12 +02:00 |
|
Laurent Destailleur
|
7c722def0f
|
FIX #7312
|
2017-09-02 01:28:19 +02:00 |
|
Laurent Destailleur
|
227c8a96c8
|
Merge pull request #7320 from hregis/6.0_bug3
Fix: avoid warning "non-numeric value encountered"
|
2017-09-02 00:09:24 +02:00 |
|
Laurent Destailleur
|
5ba13a9500
|
Merge pull request #7317 from hregis/6.0_bug2
Fix: missing $dolibarrdataroot value
|
2017-09-02 00:05:42 +02:00 |
|
Laurent Destailleur
|
d018bd4892
|
Merge pull request #7316 from aspangaro/6.0-rc_p4
FIX Missing language key "Events" everywhere
|
2017-09-02 00:00:10 +02:00 |
|
Laurent Destailleur
|
0d0b7f8af2
|
Fix email
|
2017-09-01 17:18:07 +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 |
|
Regis Houssin
|
0fc8a0f840
|
Fix: avoid warning "non-numeric value encountered"
|
2017-09-01 16:54:06 +02:00 |
|
Laurent Destailleur
|
2768878618
|
FIX Bad condition on sms log debug
|
2017-09-01 16:39:49 +02:00 |
|
Laurent Destailleur
|
ffb408f440
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-09-01 15:20:48 +02:00 |
|
Laurent Destailleur
|
ac08dec2c3
|
Avoid warnings
|
2017-09-01 15:20:29 +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 |
|
Regis Houssin
|
d9008cd302
|
Fix: missing $dolibarrdataroot value
|
2017-09-01 08:20:33 +02:00 |
|
Alexandre SPANGARO
|
be63eb8cef
|
Fix : missing language key "Events" everywhere
|
2017-09-01 07:34:01 +02:00 |
|
Laurent Destailleur
|
2ab12f54ff
|
Fix install error due to too large column with index
|
2017-08-31 22:42:14 +02:00 |
|
Laurent Destailleur
|
6a3d110d3a
|
Enhance repair for utf8 mix collation
|
2017-08-31 14:44:32 +02:00 |
|
Maxime Kohlhaas
|
49a29a16e6
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-08-31 09:02:21 +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
|
3e4a7ba97c
|
Update admin.lang
|
2017-08-30 16:46:50 +02:00 |
|
Laurent Destailleur
|
2c4e8cbb4a
|
Update admin.lang
|
2017-08-30 16:45:53 +02:00 |
|
Laurent Destailleur
|
a3085cb44a
|
Update objectline_view.tpl.php
|
2017-08-30 16:43:57 +02:00 |
|
Laurent Destailleur
|
c028771ad0
|
Merge pull request #7306 from aspangaro/6.0-rc_p2
Fix: Bank index | Accountancy journal, fetch on rowid, not code
|
2017-08-30 16:39:31 +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 |
|
Regis Houssin
|
45136de664
|
Fix: documents dir not rename and delete
|
2017-08-30 11:26:48 +02:00 |
|
Alexandre SPANGARO
|
4998eb3061
|
Fix: Accountancy journal, fetch on rowid, not code
|
2017-08-29 21:21:59 +02:00 |
|
Laurent Destailleur
|
991a33f7b6
|
Make different vat rates visible
|
2017-08-29 20:40:51 +02:00 |
|
Laurent Destailleur
|
2cf924ab74
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-08-29 19:56:03 +02:00 |
|
Laurent Destailleur
|
6c202c5fa1
|
Fix vat rate to show and not vat amount
|
2017-08-29 19:55:49 +02:00 |
|
Laurent Destailleur
|
8ca2bbecc6
|
Merge pull request #7305 from atm-quentin/6.0
FIX createFromCurrent lastvalue
|
2017-08-29 18:22:24 +02:00 |
|
Laurent Destailleur
|
945fb61e59
|
Update facture.class.php
|
2017-08-29 18:22:01 +02:00 |
|
Laurent Destailleur
|
044feab00f
|
Fix duplicate code
|
2017-08-29 17:52:10 +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
|
8f01db10a6
|
Fix setup for india
|
2017-08-29 13:41:55 +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
|
e9cdf85286
|
Fxi repeair of collation
|
2017-08-29 12:58:18 +02:00 |
|
atm-quentin
|
07f7db1b6d
|
FIX createFromCurrent lastvalue
|
2017-08-29 11:22:50 +02:00 |
|
Laurent Destailleur
|
1523b2ef80
|
FIX #7222
|
2017-08-28 14:02:08 +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
|
3d5edba574
|
Merge pull request #7302 from aspangaro/6.0-rc_p1
Fix: Search on supplier payment list doesn't work
|
2017-08-28 12:24:22 +02:00 |
|
Laurent Destailleur
|
21a7fcb01a
|
Fix substitution when sending emails
|
2017-08-28 12:18:18 +02:00 |
|
Maxime Kohlhaas
|
c3152a6343
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-08-28 10:32:04 +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 |
|
Alexandre SPANGARO
|
f6604f6578
|
Fix: Search on supplier payment list doesn't work
|
2017-08-28 06:16:31 +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
|
7916a2a648
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
build/generate_filelist_xml.php
htdocs/filefunc.inc.php
|
2017-08-27 00:38:46 +02:00 |
|
Laurent Destailleur
|
ba3581354a
|
Prepare 5.0.6
|
2017-08-27 00:35:00 +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
|
c91f70cbf4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-08-26 21:53:46 +02:00 |
|
Laurent Destailleur
|
a01bb27d7e
|
FIX install process with DoliWamp
|
2017-08-26 21:53:29 +02:00 |
|
Laurent Destailleur
|
3f806f83e3
|
Merge pull request #7293 from fappels/6.0_fix_product_list_supplier_prices
FIX product list supplier prices not shown when best buy column hidden
|
2017-08-26 19:35:01 +02:00 |
|
Laurent Destailleur
|
4445c34af0
|
Merge pull request #7287 from hregis/5.0_bug2
Fix: (Agenda) Allowed if link to third party is empty
|
2017-08-26 19:32:24 +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
|
91644d2145
|
Merge pull request #7278 from hregis/5.0_bug
Fix: file delete link doesn't work
|
2017-08-26 19:26:50 +02:00 |
|
Laurent Destailleur
|
98f5fbab5d
|
Fix error on contact/address not linked on thirdparty
|
2017-08-25 13:50:45 +02:00 |
|
Laurent Destailleur
|
da34ea6b11
|
FIX field entity "edit" and "view" was in hook but not "create".
|
2017-08-25 13:31:55 +02:00 |
|
fappels
|
533881e620
|
Fix supplier prices not shown when best buy hidden
only show value if item has supplier
|
2017-08-25 11:58:34 +02:00 |
|
Laurent Destailleur
|
d8ead2693f
|
Fix field position
|
2017-08-24 17:59:20 +02:00 |
|
Laurent Destailleur
|
7d9a18a63d
|
Fix sql error
|
2017-08-24 15:39:23 +02:00 |
|
Laurent Destailleur
|
fbac1cfe1e
|
Fix lang loading
|
2017-08-24 15:00:53 +02:00 |
|
Laurent Destailleur
|
9684c8b4bc
|
Fix css
|
2017-08-24 14:54:32 +02:00 |
|
Laurent Destailleur
|
ef31c47c15
|
Fix clear filter
|
2017-08-24 14:22:45 +02:00 |
|
Laurent Destailleur
|
2416c387f5
|
Fix trad
|
2017-08-24 13:35:52 +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
|
9079d2890c
|
Fix ajout du code devise Franc Pacifique
|
2017-08-23 18:13:42 +02:00 |
|
Laurent Destailleur
|
bf1f60b31e
|
Merge
|
2017-08-23 17:14:29 +02:00 |
|
Laurent Destailleur
|
1b1d1a8d0b
|
FIX #7156
|
2017-08-23 16:57:07 +02:00 |
|
Laurent Destailleur
|
947acfffe2
|
FIX #7173
|
2017-08-23 16:53:29 +02:00 |
|
Laurent Destailleur
|
6b5b10fc94
|
FIX #7224
|
2017-08-23 16:28:34 +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
|
52a8692a85
|
FIX #7226
|
2017-08-23 16:07:11 +02:00 |
|
Laurent Destailleur
|
29e656ec7e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-08-23 15:06:30 +02:00 |
|
Laurent Destailleur
|
4da49dfc2d
|
FIX #7239
|
2017-08-23 15:02:38 +02:00 |
|
Laurent Destailleur
|
e3370b6a98
|
FIX #7265
|
2017-08-23 12:47:59 +02:00 |
|
Laurent Destailleur
|
e25a428118
|
Fix compatibility with Internet Explorer
|
2017-08-23 12:32:28 +02:00 |
|
Regis Houssin
|
2492b9968a
|
Fix: missing scandir
|
2017-08-23 10:21:10 +02:00 |
|
Regis Houssin
|
6dda2f3670
|
Fix: "scandir" in url is blocked in some providers
|
2017-08-23 10:07:00 +02:00 |
|
Laurent Destailleur
|
aae24c26a3
|
Some fixes with smartphones
|
2017-08-22 20:20:34 +02:00 |
|
Laurent Destailleur
|
97dbb40ad6
|
Fix syntax error
|
2017-08-22 18:42:35 +02:00 |
|
Regis Houssin
|
18ca96e285
|
Fix: file delete link doesn't work
|
2017-08-22 18:33:00 +02:00 |
|
Laurent Destailleur
|
206d46cbb7
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
scripts/cron/cron_run_jobs.php
|
2017-08-22 11:18:17 +02:00 |
|
Laurent Destailleur
|
41ce4886fd
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-08-22 11:15:30 +02:00 |
|
BENKE Charlene
|
7c3640a4c3
|
Bad ojbject for extrafields
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/59536-extrafields-commande-dans-expedition
|
2017-08-22 10:37:21 +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
|
9be342bd25
|
Fix missing $form
|
2017-08-22 10:02:45 +02:00 |
|
Laurent Destailleur
|
4a310f36d8
|
Fix help url
|
2017-08-22 08:12:30 +02:00 |
|
Laurent Destailleur
|
e647b5562b
|
Fix hidden option EXPENSEREPORT_LINES_SORTED_BY_ROWID to restore
compatibility.
|
2017-08-21 23:41:32 +02:00 |
|
Laurent Destailleur
|
9ffcd9e922
|
Fix cover background size
|
2017-08-21 21:18:07 +02:00 |
|
Laurent Destailleur
|
599f6426a5
|
Fix link http
|
2017-08-21 20:49:12 +02:00 |
|
Laurent Destailleur
|
e8a2680e31
|
Sync transifex
|
2017-08-21 13:26:56 +02:00 |
|
Laurent Destailleur
|
f5993a2507
|
Better style
|
2017-08-21 12:51:48 +02:00 |
|
Laurent Destailleur
|
9782937138
|
Better info style
|
2017-08-21 12:25:38 +02:00 |
|
Laurent Destailleur
|
7aff424d1c
|
Fix bad position of field
|
2017-08-21 12:24:58 +02:00 |
|
Laurent Destailleur
|
d7be62b7da
|
Better style
|
2017-08-21 11:02:24 +02:00 |
|
Laurent Destailleur
|
84d584f607
|
Missing translation
|
2017-08-21 01:39:22 +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 |
|
Laurent Destailleur
|
aeba02fb22
|
Fix bad table alignement
|
2017-08-20 16:21:07 +02:00 |
|
Laurent Destailleur
|
1101a1094f
|
Fix translation and migration
|
2017-08-20 16:07:38 +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
|
398733ff9a
|
Fix syntax error
|
2017-08-17 23:44:16 +02:00 |
|
Laurent Destailleur
|
744f0ab198
|
Merge remote-tracking branch 'origin/5.0' into 6.0
|
2017-08-17 22:03:26 +02:00 |
|
Laurent Destailleur
|
f2d5bcbbdd
|
Merge pull request #7263 from simnandez/5.0
FIX: Bad tax calculation with expense report
|
2017-08-17 17:27:55 +02:00 |
|
Laurent Destailleur
|
323a6e34b5
|
Merge pull request #7250 from delcroip/patch-12
FIX: remove order rights on invoice page
|
2017-08-17 17:20:10 +02:00 |
|
Juanjo Menent
|
3330f040ba
|
FIX: Bad tax calculation with expense report
|
2017-08-16 11:19:28 +02:00 |
|
Laurent Destailleur
|
4d26dffa7d
|
FIX No way to add new line in supplier orders
|
2017-08-13 23:17:34 +02:00 |
|
Laurent Destailleur
|
9d4d85ca9d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-08-11 19:58:09 +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
|
dcd1a089b1
|
Merge pull request #7249 from delcroip/patch-11
Reconcile take page number into account
|
2017-08-11 17:08:40 +02:00 |
|
Laurent Destailleur
|
9ad2a9ac85
|
Merge pull request #7248 from fappels/4.0_fix_best_buy_price_calculation
FIX Best buy price calculation
|
2017-08-10 13:51:01 +02:00 |
|
Laurent Destailleur
|
5c53081007
|
Merge pull request #7244 from atm-john/new_resource_ref_mask
FIX resource hooks
|
2017-08-10 13:49:26 +02:00 |
|
Laurent Destailleur
|
f375c41950
|
Update card.php
|
2017-08-10 13:47:44 +02:00 |
|
Laurent Destailleur
|
2a59dbbc89
|
Merge pull request #7243 from altatof/fix_fourcard_hooks
FIX : supplier id was not passed to hooks
|
2017-08-10 13:44:43 +02:00 |
|
Laurent Destailleur
|
d5d92c6290
|
Update adherent_type.class.php
|
2017-08-10 12:59:01 +02:00 |
|
delcroix Patrick
|
e96eadb5e7
|
FIX: remove order rights on invoice page
|
2017-08-09 23:15:49 +02:00 |
|
delcroix Patrick
|
593d06e91e
|
Reconcile take pqge number into account
|
2017-08-09 22:24:06 +02:00 |
|
fappels
|
ca3cdfabec
|
FIX Best buy price calculation
Best buy price also depends on buy discount.
|
2017-08-09 14:15:26 +02:00 |
|
Laurent Destailleur
|
bfa8630feb
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-08-07 20:07:36 +02:00 |
|
Laurent Destailleur
|
0bf4ac6fb3
|
Add missing field fk_supplier_proposal
|
2017-08-07 20:06:26 +02:00 |
|
Laurent Destailleur
|
a7c1ff402a
|
Fix picto on support page
|
2017-08-07 16:06:38 +02:00 |
|
Laurent Destailleur
|
0960473c9b
|
More complete repair of unicode field
|
2017-08-07 15:51:30 +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 |
|
John
|
76bee57553
|
Fix Add doaction hook
|
2017-08-07 15:49:17 +02:00 |
|