lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,163 Commits 43 Branches 150 Tags 886 MiB
7ae50cf2e5
Commit Graph

5454 Commits

Author SHA1 Message Date
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
f5df3b1d69 Clean code to try to fix #16123 2021-02-02 01:30:23 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Laurent Destailleur
6fe5c2f599
Merge pull request #16109 from grandoc/new_branch_30_01_2021 
missing declaration
 2021-01-30 13:08:56 +01:00
Philippe GRAND
e584792382 missing declaration 2021-01-30 12:57:06 +01:00
Laurent Destailleur
1063b97c22 Close #16099 Close #16098 2021-01-30 12:55:38 +01:00
Philippe GRAND
0f19a11ebe missing declaration 2021-01-30 12:54:10 +01:00
Laurent Destailleur
06b0b0ac66
Merge pull request #16102 from bb2a/bug_PROPOSALS_WITH_PICTURE 
Bug Photo in propal
 2021-01-30 12:51:33 +01:00
Anthony Berton
e48fc6c3d0 Update pdf_cyan.modules.php 2021-01-29 13:51:06 +01:00
Anthony Berton
77b0075d71
Update pdf_azur.modules.php 2021-01-29 10:50:11 +01:00
Anthony Berton
720a11877d Update pdf_azur.modules.php 2021-01-29 10:48:58 +01:00
stickler-ci
400243a157 Fixing style errors. 2021-01-29 09:41:05 +00:00
Anthony Berton
fcf72d5e50 Update pdf_azur.modules.php 2021-01-29 10:35:48 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Alexandre SPANGARO
94d4f2da8e Missing language key & error translation 2021-01-26 05:14:01 +01:00
Laurent Destailleur
b4be97ec15 Draft code 2021-01-25 18:59:04 +01:00
Laurent Destailleur
599d69b07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Laurent Destailleur
7982cab526 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/contract/doc/pdf_strato.modules.php
	htdocs/ticket/card.php
 2021-01-21 18:34:55 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
 2021-01-21 13:33:47 +01:00
BlackMirror
640cf50b7f [FM] Fix 12.0 - duplicate label, probably mistaken for ref 2021-01-20 15:20:50 +01:00
Laurent Destailleur
0917b37bb9 FIX #15966 #15967 2021-01-19 15:20:35 +01:00
stickler-ci
0cdd9f8640 Fixing style errors. 2021-01-19 10:43:03 +00:00
zuiko
21fac1ff7a
Update mod_barcode_product_standard.php 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
#15918 
ok with @eldy
Avoid  sql call if no joker at the end of mask
Treat EAN13 in a more evolutive code form to prepare needs for other barcodes with key
 2021-01-19 11:40:53 +01:00
Laurent Destailleur
7f04307adf
Merge branch 'develop' into develop#2 2021-01-13 17:40:21 +01:00
Laurent Destailleur
93a2edd8d9 Fix property not used 2021-01-13 12:21:26 +01:00
Laurent Destailleur
3bed2c91c7 Fix version 2021-01-13 12:20:32 +01:00
stickler-ci
432d45b289 Fixing style errors. 2021-01-13 11:19:39 +00:00
Laurent Destailleur
1499998a99
Debug 2021-01-13 12:17:45 +01:00
zuiko
f718a396d5
Update mod_barcode_product_standard.php 
$out .= $obj->libelle; //take the libelle corresponding to the type rowid in the database
Take the libelle instead the code for the litteral value of the barcode type rowid.
 2021-01-12 21:59:09 +01:00
zuiko
364158c35b
Update mod_barcode_product_standard.php 
Blank line after comment removed...
 2021-01-12 21:24:55 +01:00
stickler-ci
14e3be630c Fixing style errors. 2021-01-12 20:16:34 +00:00
zuiko
ff06798660
Update mod_barcode_product_standard.php 
More evolving coding by testing the type of barcode in literal form.
Does not change deeply the #15918 correction principle in order to fix bug #15633.
 2021-01-12 21:14:43 +01:00
Laurent Destailleur
c2187b2ff1
Merge branch 'develop' into develop_new_workstation 2021-01-11 17:59:13 +01:00
Laurent Destailleur
df3034d13a
Merge branch 'develop' into patch-1 2021-01-11 17:15:46 +01:00
stickler-ci
f5fa7928ca Fixing style errors. 2021-01-11 15:29:33 +00:00
Laurent Destailleur
5ee97dfd4a
Update mod_barcode_product_standard.php 2021-01-11 16:27:37 +01:00
Gauthier PC portable 024
8dfb088fc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation 2021-01-11 10:34:38 +01:00
zuiko
bcff65c3d3
Update mod_barcode_product_standard.php 
get barcode type configuration for products only if $type not set
 2021-01-09 01:01:14 +01:00
Florian HENRY
8adfe54949 bulk email management 2021-01-07 17:33:57 +01:00
Laurent Destailleur
73e69f8389
Update mod_barcode_product_standard.php 2021-01-07 10:23:38 +01:00
stickler-ci
07ddb1fd2b Fixing style errors. 2021-01-06 23:17:16 +00:00
zuiko
4e95108eb0
Update mod_barcode_product_standard.php 
Fix #15633
 2021-01-06 23:33:04 +01:00
Laurent Destailleur
07ca12b26d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:48:23 +01:00
Laurent Destailleur
71278b173e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-06 20:28:33 +01:00
Laurent Destailleur
654cf2d990 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-06 20:27:46 +01:00
stickler-ci
ca557cfacd Fixing style errors. 2021-01-06 13:22:35 +00:00
quentin
e44b14364a FIX useless tracking number displayed on pdf if empty 2021-01-06 14:17:06 +01:00
lmarcouiller
6aa2241617 Merge remote-tracking branch 'doligithub/develop' into develop#2 2021-01-05 18:07:34 +01:00
Regis Houssin
acabb045fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-29 17:12:18 +01:00
Regis Houssin
325c2b03f8 FIX step by step 2020-12-29 17:02:35 +01:00
Regis Houssin
20cd9cbbc7 FIX avoid warning php 8.0 2020-12-29 16:25:29 +01:00
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
4ec78d029b Fix warning 2020-12-27 19:21:37 +01:00
Laurent Destailleur
9007e7be2a Fix sql for postgresql 2020-12-23 16:13:45 +01:00
Laurent Destailleur
70df6130b5 Fix SQL to export categories of contact 
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Conflicts:
	htdocs/product/class/product.class.php
 2020-12-23 15:45:33 +01:00
Gauthier PC portable 024
5116337e0b FIX : stickler feedbacks 2020-12-21 13:29:44 +01:00
Gauthier PC portable 024
7b739920a2 NEW : Workstations management 2020-12-21 12:28:45 +01:00
Laurent Destailleur
361f13154b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/card.php
	htdocs/margin/tabs/thirdpartyMargins.php
	htdocs/societe/card.php
	htdocs/societe/note.php
	htdocs/societe/notify/card.php
	htdocs/societe/societecontact.php
	htdocs/ticket/list.php
 2020-12-20 14:31:54 +01:00
Laurent Destailleur
8c87050703 FIX Check of customer/vendor code fails in some cases 2020-12-20 13:54:02 +01:00
Laurent Destailleur
832db82fce Fix warnings 2020-12-18 14:40:45 +01:00
Alexandre SPANGARO
440c9e4840 Fix module Intracomm 2020-12-17 06:02:28 +01:00
Laurent Destailleur
9c759e91f0 Fix debug management of docs in ticket module 2020-12-16 19:01:26 +01:00
Laurent Destailleur
82710e54a8 Fix get custom odt templates 2020-12-16 18:10:40 +01:00
Laurent Destailleur
e7dda7bb4f Move help into tooltip help section 2020-12-16 15:46:54 +01:00
Stephane Lesage
7853e77d3f Export/Import categories missing fields and clean 2020-12-15 19:53:47 +01:00
Laurent Destailleur
812fd22629
Merge branch 'develop' into develop#2 2020-12-15 14:09:29 +01:00
Laurent Destailleur
a2bd920371 Fix translation of units 2020-12-15 11:39:18 +01:00
Laurent Destailleur
55deccf364 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-14 23:20:21 +01:00
Laurent Destailleur
098f51413f Fix translation 2020-12-14 20:33:27 +01:00
Laurent Destailleur
5f9b53004b Fix warning 2020-12-14 17:40:40 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
3521a736fc Fix warnings 2020-12-12 19:49:13 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Laurent Destailleur
11eb48b60a
Merge pull request #15737 from frederic34/pdfBuildThirdpartyName 
thirdparty need to be object
 2020-12-12 12:16:31 +01:00
Frédéric FRANCE
479d709a96
fix warning 2020-12-12 09:39:54 +01:00
stickler-ci
87038f953a Fixing style errors. 2020-12-11 19:58:05 +00:00
Frédéric FRANCE
9b2c989906
thirdparty need to be object 2020-12-11 20:57:02 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +01:00
Stephane Lesage
bcf4f65cc9 Fix & sync import/export entity icons/labels translation 2020-12-10 14:15:33 +01:00
Hystepik
3d674abfae
Merge branch 'develop' into develop#2 2020-12-08 09:01:20 +01:00
Stephane Lesage
08ccc11f9e Export warehouses 2020-12-08 00:50:27 +01:00
Laurent Destailleur
86e1082138
Merge pull request #15644 from Hystepik/develop#1 
New #8172 : PHPExcel replaced by PHPSpreadSheet
 2020-12-07 23:06:21 +01:00
Laurent Destailleur
f21a4e8aed
Merge branch 'develop' into develop#3 2020-12-07 22:46:36 +01:00
Laurent Destailleur
4f826fae26 Fix warnings 2020-12-07 12:18:53 +01:00
Laurent Destailleur
0361d3afde Debug v13 2020-12-07 11:42:35 +01:00
Hystepik
2ac98d06f5
Merge branch 'develop' into develop#3 2020-12-07 09:03:59 +01:00
Laurent Destailleur
d1c66059cd Add missing tag order_ref and order_ref_customer on shipments for ODT 
generation.

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2020-12-06 19:03:46 +01:00
Laurent Destailleur
025cbe8557 Add missing tag order_ref and order_ref_customer on shipments for ODT 
generation.
 2020-12-06 19:01:09 +01:00
Laurent Destailleur
c31cf08431 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modCategorie.class.php
 2020-12-04 21:55:57 +01:00
Laurent Destailleur
2b267cf8e4 Fix warnings 2020-12-04 20:06:55 +01:00
Laurent Destailleur
3770eef8dc Fix can import all categories 2020-12-04 19:51:14 +01:00
stickler-ci
6a2d842d3e Fixing style errors. 2020-12-04 13:47:55 +00:00
lmarcouiller
9c191cda43 New #8172 : PHPExcel replace by PHPSpreadSheet 2020-12-04 14:28:09 +01:00
Laurent Destailleur
1ec3d4cfdf CSS 2020-12-03 13:19:35 +01:00
Hystepik
4830f4a3b4
Merge branch 'develop' into develop#2 2020-12-03 11:05:00 +01:00
Hystepik
ecb5a3b028
Merge branch 'develop' into develop#3 2020-12-03 10:12:19 +01:00
Laurent Destailleur
46171a6ec8 Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT 2020-12-02 21:27:15 +01:00
Laurent Destailleur
bc1dc1e9f0 FIX #15590 manually 2020-12-02 19:34:04 +01:00
lmarcouiller
c7a31b2458 new widget funnel of prospection 2020-12-02 14:42:56 +01:00
Laurent Destailleur
c8274f13eb
Merge pull request #15582 from Hystepik/develop 
Close #15307 New Widget : Encours dépassé
 2020-12-02 14:01:50 +01:00
lmarcouiller
6b5125fed0 dev widget state_board, add in user class and clean index 2020-12-01 14:50:12 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
fc91e70e47
Update modFacture.class.php 2020-11-30 18:37:07 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
lmarcouiller
00dca7ff9b NEW : Encours dépassé #15307 2020-11-30 13:01:45 +01:00
Laurent Destailleur
8eacbaaf5f
Merge pull request #15570 from frederic34/strike 
simplify function
 2020-11-29 19:10:06 +01:00
Laurent Destailleur
5ad1bb5b20
Merge pull request #15571 from frederic34/patch-14 
Update mod_codecompta_aquarium.php
 2020-11-29 19:08:29 +01:00
Laurent Destailleur
beafcc7853 Fix warning 2020-11-29 16:06:03 +01:00
Frédéric FRANCE
83c60d725a
Update mod_codecompta_aquarium.php 2020-11-28 23:45:32 +01:00
Frédéric FRANCE
3a041eed44
simplify function 2020-11-28 23:42:48 +01:00
Frédéric FRANCE
11a978ca08
simplify function 2020-11-28 23:41:44 +01:00
Frédéric FRANCE
eea9382b57
Update mod_codecompta_aquarium.php 2020-11-28 23:35:27 +01:00
Frédéric FRANCE
f9ef0f4d69 Update mod_codecompta_digitaria.php 2020-11-28 23:33:58 +01:00
Frédéric FRANCE
2f701f4889
Update mod_codecompta_aquarium.php 2020-11-28 23:24:13 +01:00
Frédéric FRANCE
fb871daf14
simplify function 2020-11-28 23:04:05 +01:00
Laurent Destailleur
147a12a922 Fix warning 2020-11-28 15:02:05 +01:00
Laurent Destailleur
df461d319e Fix warning 2020-11-28 02:12:07 +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
4a5cdd0092 Several fixes in export and repair tool 2020-11-27 15:27:35 +01:00
Laurent Destailleur
250b42f60a Fix phpcs 2020-11-27 00:37:36 +01:00
Laurent Destailleur
9aa657bc35 Debug v13 2020-11-26 18:48:51 +01:00
Laurent Destailleur
5d0a54c0de Fix var not defined 2020-11-26 12:07:01 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Laurent Destailleur
d17ecbeccd Fix #15438 2020-11-24 20:56:11 +01:00
Laurent Destailleur
bd0236edeb Fix #15438 2020-11-24 20:53:42 +01:00
Laurent Destailleur
cf82581a2a Move module to experimental 2020-11-24 14:06:02 +01:00
Laurent Destailleur
af2eabb24d Fix warning 2020-11-22 15:06:53 +01:00
Laurent Destailleur
3d2da45f84 Remove warning 2020-11-22 11:36:07 +01:00
Laurent Destailleur
3534555909 Fix setup of scheduled jobs 2020-11-21 14:14:53 +01:00
Laurent Destailleur
95460e6372
Merge pull request #15422 from frederic34/patch-10 
add optional tag which list all other tags in odt substitutions
 2020-11-18 12:44:25 +01:00
Frédéric FRANCE
bf390ceb4d
Update doc_generic_member_odt.class.php 2020-11-17 11:56:11 +01:00
Frédéric FRANCE
fcfd630f84
Update doc_generic_user_odt.modules.php 2020-11-17 11:55:05 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Frédéric FRANCE
d114c56672
add a tag which list all other tags in odt user 2020-11-15 23:49:16 +01:00
Laurent Destailleur
8e87729040
Merge pull request #15416 from frederic34/patch-25 
doxygen
 2020-11-15 17:06:34 +01:00
Laurent Destailleur
acfee5a0e1
Merge pull request #15415 from frederic34/patch-24 
doxygen
 2020-11-15 17:05:55 +01:00
Laurent Destailleur
041de0843a
Merge pull request #15414 from frederic34/patch-23 
doxygen
 2020-11-15 17:05:39 +01:00
Laurent Destailleur
27f3287ac4
Merge pull request #15413 from frederic34/patch-22 
doxygen
 2020-11-15 17:05:22 +01:00
Laurent Destailleur
c4094357c2
Merge pull request #15412 from frederic34/patch-21 
doxygen
 2020-11-15 17:05:03 +01:00
Laurent Destailleur
a1bdce06f5
Merge pull request #15411 from frederic34/patch-20 
doxygen
 2020-11-15 17:04:45 +01:00
Laurent Destailleur
db357da9a7
Merge pull request #15410 from frederic34/patch-19 
doxygen
 2020-11-15 17:04:17 +01:00
Laurent Destailleur
31c73403c0
Update pdf_eratosthene.modules.php 2020-11-15 17:04:07 +01:00
Laurent Destailleur
d0cf558604
Merge pull request #15409 from frederic34/patch-18 
doxygen
 2020-11-15 17:02:54 +01:00
Laurent Destailleur
ed6204183d
Merge pull request #15408 from frederic34/patch-17 
doxygen
 2020-11-15 17:00:54 +01:00
Laurent Destailleur
011e786996
Update pdf_sepamandate.modules.php 2020-11-15 17:00:37 +01:00
Laurent Destailleur
0db18136a5
Merge pull request #15407 from frederic34/patch-15 
doxygen
 2020-11-15 16:59:47 +01:00
Laurent Destailleur
c0ce41dc0d
Merge pull request #15406 from frederic34/patch-14 
doxygen
 2020-11-15 16:59:25 +01:00
Laurent Destailleur
5c15162c40 Fix warning 2020-11-15 15:10:15 +01:00