Commit Graph

10441 Commits

Author SHA1 Message Date
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
d3a2aa664f FIX #15572 2020-11-29 20:27:40 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Laurent Destailleur
85a6a296c8 Fix links 2020-11-28 19:13:17 +01:00
Laurent Destailleur
59b445a103 Clean dead code 2020-11-28 14:47:39 +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
Laurent Destailleur
69b06a25e8 Fix code of deletion of objects 2020-11-26 09:16:16 +01:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop
Fix bank transfert supplier
2020-11-25 13:06:10 +01:00
Laurent Destailleur
0ad0035f19
Update list.php 2020-11-25 12:47:10 +01:00
Florian HENRY
73d6266151 continue fix banktransfert supplier 2020-11-25 11:22:31 +01:00
Florian HENRY
12ef03f06d fix banck tranfert supplier 2020-11-25 10:58:34 +01:00
Florian HENRY
4a316f06d5 fix : finish bank transfert fourn from list 2020-11-25 10:24:44 +01:00
Laurent Destailleur
81566289cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
890f7a0602
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to
FIX  Dol print error : conf usage thirdparty propagate extrafields to
2020-11-23 21:43:03 +01:00
ATM john
fbc911aea1 Fix conf usage thirdparty propagate extrafields to 2020-11-23 16:40:31 +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
Laurent Destailleur
f2cd2570b9 Fix link 2020-11-22 12:03:44 +01:00
Laurent Destailleur
3d2da45f84 Remove warning 2020-11-22 11:36:07 +01:00
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Laurent Destailleur
7195760ade Restore lost param 2020-11-18 18:20:40 +01:00
Laurent Destailleur
1708874306
Merge branch 'develop' into develop 2020-11-18 18:16:29 +01:00
Laurent Destailleur
928330c44b Fix link to reconciliation page 2020-11-16 12:42:59 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Frédéric FRANCE
52b4e2fbc5
doxygen 2020-11-14 22:25:25 +01:00
Laurent Destailleur
3c5ef18b36 FIX #15390 2020-11-14 00:47:28 +01:00
lmarcouiller
304e4ac8e6 FIX : #15373 Reset invalid email script 2020-11-13 11:07:35 +01:00
lmarcouiller
a1f26f2b55 FIX :15373 Reset invalid email script 2020-11-13 11:03:49 +01:00
lmarcouiller
0e5b18a1e9 FIX : #14713 bank graph show all accounts 2020-11-13 10:05:28 +01:00
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +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
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
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
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
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Laurent Destailleur
e103503bb1 Fix warning php8 2020-11-08 12:34:45 +01:00
Laurent Destailleur
d04bbe09b7 Fix syntax error 2020-11-08 00:38:12 +01:00
Laurent Destailleur
a9fbe9dd6c Fix remove warning 2020-11-08 00:18:41 +01:00
Laurent Destailleur
e2f5a302be Fix warning 2020-11-07 23:04:23 +01:00
Laurent Destailleur
129c53342a Fix warning 2020-11-07 20:01:28 +01:00
Laurent Destailleur
215ecafb32 Look adn feel v13 2020-11-07 15:54:58 +01:00
Laurent Destailleur
a46248ffe9
Merge pull request #15311 from frederic34/patch-6
doxygen
2020-11-06 18:45:34 +01:00
Laurent Destailleur
1649a8b5a6 Fix status 2020-11-06 16:41:54 +01:00
lvessiller
4ddff7173f NEW include tpl for loading lang file for extra fields in list 2020-11-06 12:19:45 +01:00
Laurent Destailleur
ac6f8e4e7c Debug v13 2020-11-06 11:52:48 +01:00
Laurent Destailleur
ed8a0093ff Debug v13 2020-11-05 22:25:14 +01:00
Frédéric FRANCE
3f164f1a9b
doxygen 2020-11-05 20:13:13 +01:00
Laurent Destailleur
3295d37be2
Merge pull request #15284 from frederic34/patch-13
Update card.php
2020-11-04 20:31:46 +01:00
Laurent Destailleur
79a56571f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-04 18:51:06 +01:00
Laurent Destailleur
1a2d094ce7 Removed dead code 2020-11-04 18:50:49 +01:00
Laurent Destailleur
d6b25bd891
Revert "remove deprecated" 2020-11-04 18:45:50 +01:00
Laurent Destailleur
ef5b14d20f
Merge pull request #15285 from frederic34/patch-14
remove deprecated
2020-11-04 18:41:32 +01:00
Laurent Destailleur
6392a36489
Merge pull request #15282 from frederic34/patch-10
doxygen
2020-11-04 18:36:03 +01:00
Frédéric FRANCE
ce2e8407d5
remove deprecated 2020-11-03 21:28:57 +01:00
Frédéric FRANCE
6c3ecc600d
Update card.php 2020-11-03 21:02:57 +01:00
Frédéric FRANCE
73d01612d4
doxygen 2020-11-03 20:50:51 +01:00
Frédéric FRANCE
d80f614e20
doxygen 2020-11-03 20:43:42 +01:00
Laurent Destailleur
508683b9f0 Clean duplicated code 2020-11-03 14:52:04 +01:00
Laurent Destailleur
b0e2d40533 Debug and fix v13 2020-11-03 14:19:54 +01:00
Laurent Destailleur
9e967a578e FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE 2020-11-03 02:17:51 +01:00
Laurent Destailleur
3df0d5dc22 FIX #15268 2020-11-02 20:05:06 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
72160deef7 FIX #14979 2020-11-01 17:01:26 +01:00
Laurent Destailleur
ad922bfde6 FIX #15074 2020-11-01 16:08:09 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
8daf0c168c
Update facture.class.php 2020-10-31 13:27:29 +01:00
Frédéric FRANCE
8190711342
doxygen 2020-10-30 18:01:01 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
c187b41714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:39 +01:00
Laurent Destailleur
ee4a827627 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/db/DoliDB.class.php
2020-10-29 13:10:10 +01:00
Laurent Destailleur
2a386b6fea Fix set subledger account 2020-10-29 11:13:18 +01:00
Laurent Destailleur
91cf5de54d Fix bad sort order 2020-10-29 11:06:18 +01:00
Laurent Destailleur
b1b7a7c725 Fix missing transaction 2020-10-29 10:40:50 +01:00
Frédéric FRANCE
7a7a6f8018
fix phpcs 2020-10-27 21:28:26 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36 Fix scrutinizer 2020-10-27 18:55:55 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
56903d3677 Fix trans 2020-10-27 10:35:22 +01:00
Laurent Destailleur
16ac8a9d52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 10:33:46 +01:00
Laurent Destailleur
8bcd704d9b Disable notif as it is used as a frame 2020-10-27 10:32:25 +01:00
Laurent Destailleur
5943e784ec Remove var_dump 2020-10-27 10:27:44 +01:00
Laurent Destailleur
00b49dba18 Fix label 2020-10-27 10:26:30 +01:00
Laurent Destailleur
ffc961599c FIX error 500 on cash fence 2020-10-27 10:19:00 +01:00
Laurent Destailleur
3f0a9cfce9 Fix var not defined 2020-10-27 02:03:13 +01:00
Laurent Destailleur
2638d4596a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
2020-10-25 21:33:13 +01:00
Laurent Destailleur
6bc0630c5f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
2020-10-25 21:09:43 +01:00
Laurent Destailleur
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
11878 - select the only bank account
2020-10-25 14:56:08 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
a7b23dc4f6
Update chargesociales.class.php 2020-10-25 14:14:50 +01:00
Maxime Kohlhaas
309691f1e7 Fix #15143 selected lines on invoice creation 2020-10-25 09:28:41 +01:00
Laurent De Coninck
1d62834b2c
use the second version for default bank account 2020-10-24 17:15:48 +02:00
Frédéric FRANCE
f4181a77cd
Update chargesociales.class.php 2020-10-24 13:53:00 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Laurent Destailleur
8d5d7f801c
Merge branch 'develop' into patch-7 2020-10-23 14:10:33 +02:00
Laurent Destailleur
d21ad72e4a Fix phpcs 2020-10-23 13:58:19 +02:00