Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-26 11:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,555 Commits 36 Branches 191 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

166 Commits

Author SHA1 Message Date
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Laurent Destailleur
aa1551bf1f FIX class not found when creating recuring invoice from invoice+discount 2021-03-03 22:46:25 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-02-08 17:25:05 +01:00
atm-lena
c5f73ec12a Resolve ret 2021-02-04 10:42:42 +01:00
atm-lena
e9b5a52a4f Add hidden conf to display supplier in object lines 2021-02-03 15:22:04 +01:00
Laurent Destailleur
68302d74ba Fix look and feel v14 2021-01-16 14:10:37 +01:00
Laurent Destailleur
9962c182c4 Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr 
NEW : Extrafields of documents lines are inside the lines, not any more on separate TR
 2021-01-11 16:15:45 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Florian HENRY
86075a4db9 review code 2021-01-04 20:00:57 +01:00
Florian HENRY
fefc9040ab NEW : Display extrafields (for lines/det into line tr instead of ugly other tr 2020-12-22 12:52:01 +01:00
Laurent Destailleur
3443174f67 Sync transifex 2020-11-30 18:28:04 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01: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
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Laurent Destailleur
7a28972c8a FIX sign of amount of invoice lines for credit note with multicurrency 
FIX Add INVOICE_POSITIVE_CREDIT_NOTE_SCREEN to solve PT requirement
 2020-09-15 11:18:21 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
5b882e333d Fix tooltip on localtaxes 2020-06-10 23:00:17 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
496d8f354f Look and feel v12 2020-04-22 17:59:54 +02:00
Laurent Destailleur
1ef89eb1a1 Fix $mysoc global not loaded. 2020-04-21 14:14:49 +02:00
Laurent Destailleur
b407797ca3 Fix css 2020-03-31 17:45:45 +02:00
Laurent Destailleur
fca6d45baa NEW Overwrite tpl with module_part['tpl'] is deprecated. USe hooks 
instead.
 2020-03-19 10:15:34 +01:00
Laurent Destailleur
be3ecb3093 Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless 2020-02-21 14:32:53 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
ad7278e6a5 FIX Label of DEPOSIT on screen 
Fix look and feel v11
 2020-01-16 02:48:24 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
0b73cdb7cc Fix use of currency accuracy 2019-12-11 17:14:32 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
ptibogxiv
b06bfef632 NEW display supplier in objectline if defined 2019-08-11 13:08:17 +02:00
Laurent Destailleur
2ac8723ce9 Code comment 2019-06-11 21:02:41 +02:00
Laurent Destailleur
c3732f2b7a Fix edition of margins in recurring invoices 2019-05-20 14:41:47 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00
Laurent Destailleur
9c45b781af Fix balance of colspan 2019-04-30 16:44:11 +02:00
Laurent Destailleur
862917edff NEW Tooltip with vat amount and price incl tax on lines of objects. 2019-04-10 21:24:23 +02:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5 Merge pull request #10446 from mapiolca/8.0 
Fix #10317 et #10318
 2019-01-30 16:43:14 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
cedf1bb269 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-01-29 19:13:57 +01:00