Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 20:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,562 Commits 36 Branches 190 Tags
c5f3f428672bbf27ffb51a410b58c03b664fae14
Commit Graph

6081 Commits

Author SHA1 Message Date
Gauthier PC portable 024
861b583668 FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice 2021-03-01 16:34:42 +01:00
Frédéric FRANCE
8c45137b37 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-01 12:55:45 +01:00
Alexandre SPANGARO
94a861c1c8 Code enhanced - Standardize field name 2021-03-01 04:07:31 +01:00
Alexandre SPANGARO
ca7958f273 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 07:32:23 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
 2021-02-26 19:23:23 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Frédéric FRANCE
96b0f3a25c code syntax directory 2021-02-26 16:19:52 +01:00
Laurent Destailleur
5d0a0fe341 Clean code 2021-02-26 14:53:16 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Florian HENRY
fa65956801 Merge branch 'develop' into dev_EventOrganisation_draft 2021-02-22 21:02:22 +01:00
Alexandre SPANGARO
7f4040e464 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:59:13 +01:00
Alexandre SPANGARO
22c936ba19 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:28:36 +01:00
Laurent Destailleur
f99232e66e Merge branch 'develop' into 14a21 2021-02-22 11:18:07 +01:00
Alexandre SPANGARO
267b095786 Fix import/export 2021-02-22 06:09:33 +01:00
Alexandre SPANGARO
d7993253e7 Export 2021-02-22 05:33:40 +01:00
Alexandre SPANGARO
dfb6490bb4 Fix export 2021-02-22 05:24:39 +01:00
Alexandre SPANGARO
116a491ae1 Revert "Fix export" 
This reverts commit 01e351e87e.
 2021-02-22 05:23:02 +01:00
Alexandre SPANGARO
01e351e87e Fix export 2021-02-22 05:19:48 +01:00
Florian HENRY
556ba2b369 statart card 2021-02-20 23:17:48 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Laurent Destailleur
3a073c75e7 Too verbose 2021-02-19 18:01:47 +01:00
Florian HENRY
e46d4ee75d fix sample product import files 2021-02-19 18:01:36 +01:00
Florian HENRY
f111302a25 fix column count 2021-02-19 18:01:25 +01:00
Florian HENRY
32a360dd2a fix sample xls file 2021-02-19 18:01:16 +01:00
Florian HENRY
527c32d79e with new phpoffice col start at 1 not 0 2021-02-19 18:01:04 +01:00
Laurent Destailleur
db34481cf6 Merge pull request #16345 from FHenry/13_fix_column_excelfiles 
FIX : Import Excel Failed and sample import file excel missing 1st column
 2021-02-19 17:56:58 +01:00
Laurent Destailleur
fd0615b3fc Too verbose 2021-02-19 17:56:04 +01:00
Laurent Destailleur
3ab80469ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 16:11:36 +01:00
Laurent Destailleur
574c0df427 Merge pull request #16338 from aspangaro/13p5 
Fix module asset in development
 2021-02-19 16:05:35 +01:00
Florian HENRY
6fe9b589ed fix sample product import files 2021-02-18 12:50:15 +01:00
Florian HENRY
58a1904c15 fix column count 2021-02-18 12:48:06 +01:00
Florian HENRY
de2d5c7188 fix sample xls file 2021-02-18 12:24:24 +01:00
Florian HENRY
35dc1e7d4f with new phpoffice col start at 1 not 0 2021-02-18 11:04:37 +01:00
stickler-ci
8673f7625f Fixing style errors. 2021-02-17 17:36:29 +00:00
Florian HENRY
fc3cc915ee new_add_field_product_export 2021-02-17 18:29:56 +01:00
Laurent Destailleur
32370bf63d Look and feel v14 2021-02-15 20:13:38 +01:00
Laurent Destailleur
0bac454f25 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-15 16:40:45 +01:00
Laurent Destailleur
7b383b58c6 Trans 2021-02-15 16:35:51 +01:00
Laurent Destailleur
d183a7eedf Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage 
wip : Event Organization module - PR-1 - setup page  #FoundationFunding
 2021-02-15 15:59:19 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Florian HENRY
02b698c128 move files to real diredtory 2021-02-14 17:09:23 +01:00
Laurent Destailleur
cd4d790d2b Add parameters of batch into comment description 2021-02-12 17:15:23 +01:00
Laurent Destailleur
4a2cd0d509 Merge pull request #16253 from AlexisLaurier/13.0 
contract - uses of multidir_output for file path
 2021-02-11 19:00:20 +01:00
Laurent Destailleur
1b11d9d0e9 FIX payment term label on PDF 2021-02-11 17:48:53 +01:00
Alexis LAURIER
468f40743d contract - use multidir_output 2021-02-10 13:18:55 +01:00
Philippe GRAND
66b06405d9 standardization, internationalisation 2021-02-09 14:20:10 +01:00
Philippe GRAND
44f2269764 standardization, internationalisation 2021-02-09 14:19:17 +01:00
Philippe GRAND
8fd7d3e586 standardization, internationalisation 2021-02-09 14:18:27 +01:00
Philippe GRAND
182563329f standardization, internationalisation 2021-02-09 14:17:38 +01:00