lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,734 Commits 43 Branches 150 Tags 886 MiB
8079105aaf
Commit Graph

1814 Commits

Author SHA1 Message Date
Laurent Destailleur
beb9f4f1e9 Fix 2 lines on one line when there is 2 or more sale representatives 2021-02-09 21:35:50 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Frédéric FRANCE
e0b2e26da6
fix html 2021-02-07 19:05:10 +01:00
Laurent Destailleur
1b7ee97082 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-04 19:49:32 +01:00
Laurent Destailleur
8cbd9fc0d8 CSS 2021-02-04 19:48:57 +01:00
Florian HENRY
ec41bf58e5 always ajax now 2021-02-04 09:48:17 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Frédéric FRANCE
118c9ac990
add more infos in link 2021-01-20 21:02:01 +01:00
Frédéric FRANCE
9e5f0a8cb9
add more infos in link 2021-01-20 18:45:44 +01:00
Laurent Destailleur
2859070c5c Fix filet on extrafields date 2021-01-17 15:47:43 +01:00
Laurent Destailleur
5bd59cd6d1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:11:40 +01:00
Laurent Destailleur
f3e28c2dd0 FIX GETPOST of qty with wrong parameters 2021-01-11 13:00:29 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Laurent Destailleur
00cb253873
Merge pull request #15858 from frederic34/patch-10 
syntax error
 2021-01-04 14:07:56 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Laurent Destailleur
46a5fa52da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:04:35 +01:00
Laurent Destailleur
2d1121031a var not defined 2021-01-02 17:04:08 +01:00
Laurent Destailleur
982f8eb95d Fix syntax error 2021-01-02 17:03:26 +01:00
Laurent Destailleur
150b338764 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:02:08 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Frédéric FRANCE
e4b5ec122e
syntax error 2021-01-02 16:38:19 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes 
NEW Can toggle FCKeditor on public/private notes
 2020-12-27 15:06:35 +01:00
Laurent Destailleur
6c2a17b29a Fix warning 2020-12-24 02:59:00 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
7fae5ea800 Code clean 2020-12-20 18:21:34 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Laurent Destailleur
1f6f434a9c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export_files.php
	test/phpunit/SecurityTest.php
 2020-12-11 15:56:19 +01:00
Laurent Destailleur
b3d49c4dce Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-11 15:54:31 +01:00
Ferran Marcet
7360fcd03e FIX: Bad rigths to send contract 2020-12-10 13:11:55 +01:00
Laurent Destailleur
10a0c98f94 Debug v13 2020-12-09 19:26:41 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element 
doxygen
 2020-12-07 22:31:08 +01:00
Laurent Destailleur
de61a7cfd3 Fix cleaning html tags with trans and with GETPOST. 2020-12-06 17:30:27 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Frédéric FRANCE
d9759c4a54
doxygen 2020-11-25 18:12:59 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Laurent Destailleur
4ca71764c4 FIX #15479 2020-11-23 22:04:21 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Florian HENRY
46326d7659 merge from develop 2020-11-19 13:53:34 +01:00
Laurent Destailleur
548a25b005 Fix use of token 2020-11-16 14:36:23 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-11-09 14:18:56 +00:00