Laurent Destailleur
f06911a8b0
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/societe/commerciaux.php
2016-03-04 15:39:55 +01:00
Laurent Destailleur
9ffaf9b218
Merge remote-tracking branch 'origin/3.7' into 3.8
2016-03-04 14:51:59 +01:00
Laurent Destailleur
3b70bbb05a
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Marcos García de La Fuente
7d336bd5d4
FIX #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property
...
Close #4414
2016-03-02 11:43:55 +01:00
Marcos García de La Fuente
123d6fb6e5
FIX #4425 Missing "VAT" translation in supplier order popup
...
Close #4425
2016-03-02 11:29:42 +01:00
Laurent Destailleur
a26f880843
Fix missing declarion of form
...
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
2016-03-01 00:59:42 +01:00
fmarcet
77490bff71
FIX: Status filter don't work
2016-02-29 10:07:48 +01:00
Laurent Destailleur
5453f99e2e
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
2016-02-27 18:33:39 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
aspangaro
c907cd139c
Lot of corrections
2016-02-27 08:15:58 +01:00
fmarcet
30d6aa0b96
FIX: Some filters are lost when paging
2016-02-26 13:14:23 +01:00
Laurent Destailleur
e7e6957073
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-22 09:27:53 +01:00
philippe grand
6f6f2a0574
enhance code help translation
2016-02-20 11:18:02 +01:00
Laurent Destailleur
cc524c8180
Fix bad picto
2016-02-19 04:41:29 +01:00
Laurent Destailleur
7ba6754a55
Fix the missing button to record reception
2016-02-18 00:27:35 +01:00
philippe grand
03b9b65d93
[quality] : better help
2016-02-16 16:45:19 +01:00
Laurent Destailleur
713050bd57
Fix style on payment page
2016-02-05 12:46:41 +01:00
Laurent Destailleur
99b2236260
FIX Selection of project must no show closed project
2016-01-28 12:19:13 +01:00
Laurent Destailleur
dbaa43f3be
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/card.php
2016-01-23 11:39:37 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
34c648b351
FIX #4418
2016-01-22 03:04:07 +01:00
Regis Houssin
6e30d5e516
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
2016-01-15 13:16:40 +01:00
Regis Houssin
905f9d78ed
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
2016-01-15 13:12:19 +01:00
Laurent Destailleur
cbe65fbc79
Fix: fields added into 3.8 to store email event was not enough. To late
...
to use them. Will be done into 4.0
2016-01-08 13:05:56 +01:00
Laurent Destailleur
a974fa858d
Merge pull request #4328 from frederic34/patch-8
...
Indentation
2016-01-06 18:51:55 +01:00
Laurent Destailleur
d6c5a73264
Fix missing payment fields definition in export
2016-01-06 17:37:01 +01:00
Laurent Destailleur
abe3f192fa
Debug and fix when using dolibarr with jmobile
2016-01-03 16:23:23 +01:00
Frédéric FRANCE
998649d467
Indentation
2016-01-02 18:51:31 +01:00
Laurent Destailleur
0314b3b5b1
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
2016-01-02 12:27:08 +01:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
phf
fffc8a430d
FIX call trigger LINEBILL_SUPPLIER_CREATE
2015-12-31 15:48:16 +01:00
Sof
c04eef35d5
FIX: Field cost_price does not exist and typos
2015-12-28 19:07:25 +01:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Laurent Destailleur
e536e10269
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-howto.txt
htdocs/filefunc.inc.php
2015-12-27 19:06:31 +01:00
Marcos García de La Fuente
ebdaf7dfa6
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
2015-12-27 15:12:02 +01:00
Laurent Destailleur
18fdb75c98
Missing global
2015-12-23 20:02:15 +01:00
Laurent Destailleur
559e621fd2
Fix conflict with trigger to delete payment customer and supplier.
2015-12-23 19:54:56 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
f0802eb36b
FIX #4245 PHP 7
2015-12-19 19:48:36 +01:00
Laurent Destailleur
3517b64031
FIX #4228 PHP7 error
2015-12-19 18:18:24 +01:00
Laurent Destailleur
f25a9030eb
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
Sof
011f0fbb0b
FIX : Typo error
2015-12-15 14:04:52 +01:00
Laurent Destailleur
84ee18a11b
Fix bad management of second level approvement
2015-12-14 10:33:18 +01:00
philippe grand
2cd49043a6
[Qual] Close database handler should be after Footer
2015-12-11 19:37:12 +01:00
philippe grand
fc8c12d6f6
[Qual] Uniformize code
2015-12-10 16:14:37 +01:00
Laurent Destailleur
3bcdc5c9c0
Merge pull request #4181 from grandoc/develop
...
[Qual] Uniformize code
2015-12-10 13:35:44 +01:00
Laurent Destailleur
c497a5e526
Merge pull request #4171 from IonAgorria/fix-dateranges
...
Fix date handling for hours/mins in some pages
2015-12-10 13:08:30 +01:00
philippe grand
01c6728aa9
[Qual] Uniformize code
2015-12-08 11:35:08 +01:00
Ion Agorria
1dc5854535
Fix date handling for hours/mins in some pages
2015-12-07 03:59:03 +01:00