Commit Graph

91569 Commits

Author SHA1 Message Date
Laurent Destailleur
d3e95f9341
Merge pull request #15361 from frederic34/patch-10
doxygen
2020-11-12 12:34:12 +01:00
Laurent Destailleur
a168c3fbb1 Remove warnings 2020-11-12 12:33:29 +01:00
Laurent Destailleur
d9beced0e3 Add skeleton of script to clean email database 2020-11-12 12:09:36 +01:00
Laurent Destailleur
31fcf12643 Add script reset-invalid-emails.php 2020-11-12 12:03:43 +01:00
Laurent Destailleur
ec283dc04f Removed duplicated translation keys 2020-11-11 23:50:46 +01:00
Laurent Destailleur
576e1e1de8 Fix pdf crabe 2020-11-11 23:42:24 +01:00
Frédéric FRANCE
f375640350
Update cactioncomm.class.php 2020-11-11 23:24:09 +01:00
Laurent Destailleur
767f07d02e Debug function to show list of files in ECM module 2020-11-11 22:47:06 +01:00
Laurent Destailleur
03e60bf084 Fix warning 2020-11-11 20:27:21 +01:00
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +01:00
Laurent Destailleur
a804ad4914 css 2020-11-11 16:15:06 +01:00
Laurent Destailleur
741806f47e Clean code 2020-11-11 16:08:00 +01:00
Laurent Destailleur
ad04646c05 Fix must use json_encode/decode instead of dol_json_encode/decode 2020-11-11 15:56:19 +01:00
Laurent Destailleur
e221e19212 Update doc 2020-11-11 13:20:17 +01:00
Laurent Destailleur
42ea51be49 Fix migration 2020-11-11 07:43:45 +01:00
Laurent Destailleur
64428f34a0 Fix error message 2020-11-11 05:04:15 +01:00
Laurent Destailleur
617da2ec5f Fix error message 2020-11-11 04:55:44 +01:00
Laurent Destailleur
dada0e16f5 Fix group by 2020-11-11 01:25:04 +01:00
Laurent Destailleur
947d63495a
Merge pull request #15347 from prietojc/develop_patch-2
FIX: Update fourn list to see cond_reglement
2020-11-11 01:23:09 +01:00
Laurent Destailleur
60bd1d7caf
Merge pull request #15353 from andreubisquerra/master
Credit note improvements in TakePOS
2020-11-11 01:22:46 +01:00
Laurent Destailleur
7ed4a719e0
Merge pull request #15348 from frederic34/patch-6
Update user.class.php
2020-11-11 01:16:01 +01:00
Laurent Destailleur
845f24cc20
Merge pull request #15350 from frederic34/patch-10
doxygen
2020-11-11 01:13:47 +01:00
Laurent Destailleur
0db5438479
Merge pull request #15352 from andreubisquerra/develop
NEW Receipt Printer module as stable
2020-11-11 01:12:48 +01:00
andreubisquerra
d6b5168d12
NEW Receipt Printer module as stable
I want to propose in the canceled devcamp to set this module as stable. I will present the new TakePOS connector in the devcamp too, and requires this module. What a pity, the devcamp was canceled.
2020-11-10 22:19:46 +01:00
Frédéric FRANCE
2f7b445c9e
doxygen 2020-11-10 21:57:49 +01:00
Frédéric FRANCE
0f8fc7ef2b
Update user.class.php 2020-11-10 21:46:51 +01:00
jove@bisquerra.com
43ced3c681 Credit note improvement in TakePOS 2020-11-10 21:45:15 +01:00
Frédéric FRANCE
fd078ef713
Update user.class.php 2020-11-10 21:43:45 +01:00
Laurent Destailleur
00e3627dd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-10 20:14:08 +01:00
Laurent Destailleur
db08786ddf Add missing properties 2020-11-10 20:13:54 +01:00
jcp
d73e6a4670 Update fourn list to see cond_reglement 2020-11-10 19:37:08 +01:00
Laurent Destailleur
fd94f8b706
Merge pull request #15344 from joseplluis/patch-8
FIX consider customer prices by qty in ajax fetch
2020-11-10 17:32:34 +01:00
Josep Lluís
ef3f344631
FIX consider customer prices by qty in ajax fetch
Consider the experimental function PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES (customer prices by qty) in ajax product fetch
2020-11-10 16:35:38 +01:00
Laurent Destailleur
29f0a9b784 Fix in select of user when firstname and lastname is empty 2020-11-10 15:03:35 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
NEW include tpl for loading lang file for extra fields in list
2020-11-10 14:42:21 +01:00
Laurent Destailleur
077821da82
Merge pull request #15342 from grandoc/new_branch_10_11_2020
fix : display vat_tx instead of Array text
2020-11-10 14:38:00 +01:00
Laurent Destailleur
ecaf732881
Update sellsjournal.php 2020-11-10 14:37:33 +01:00
Laurent Destailleur
bebdf12f8c
Update purchasesjournal.php 2020-11-10 14:37:00 +01:00
Laurent Destailleur
f8ddad4d4c Fix warning 2020-11-10 13:20:45 +01:00
Philippe GRAND
51141883d4 fix : display vat_tx instead of Array% 2020-11-10 11:42:07 +01:00
Laurent Destailleur
47b3b30aaa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/fourn/product/list.php
	htdocs/product/fournisseurs.php
	htdocs/societe/card.php
2020-11-10 11:10:35 +01:00
Philippe GRAND
dc0b610fd5 fix : display vat_tx instead of Array text 2020-11-10 11:07:10 +01:00
Laurent Destailleur
73df033000 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/boxes/box_birthdays.php
2020-11-10 11:05:53 +01:00
Laurent Destailleur
8458025e1d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-09 19:47:33 +01:00
Laurent Destailleur
4a5c7d299f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
2020-11-09 19:47:25 +01:00
Laurent Destailleur
59abed9153
Merge pull request #15337 from ATM-Consulting/FIX_12.0_remove_set_thirdparty_action_on_invoice
Following PR#15336: it should not be possible to modify the third par…
2020-11-09 19:08:14 +01:00
Laurent Destailleur
18d4840f85
Merge pull request #15334 from aspangaro/10_p57
FIX: Accountancy - Some ajustments on length of the account (general & auxiliary)
2020-11-09 19:02:35 +01:00
Laurent Destailleur
c529a92b92
Merge pull request #15333 from atm-gauthier/11.0_fix_disabled_sales_representative
FIX : disabled users must not be available in sales representative list on societe edit mode
2020-11-09 19:02:01 +01:00
Florian Mortgat
bf27c56fa7 Following PR#15336: it should not be possible to modify the third party of an invoice 2020-11-09 17:09:06 +01:00
Laurent Destailleur
560b8db44a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-09 15:29:17 +01:00