Commit Graph

10342 Commits

Author SHA1 Message Date
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