Laurent Destailleur
68bb95079a
Ignore 2 rules
2019-03-04 17:36:03 +01:00
Laurent Destailleur
69794f5293
Fix phpcs
2019-03-04 17:31:50 +01:00
Laurent Destailleur
d8259f94e1
Work on BOM module
2019-03-04 13:40:16 +01:00
Laurent Destailleur
925def5390
Work on BOM module
2019-03-04 13:37:00 +01:00
Laurent Destailleur
7b7ff33fdf
Work on BOM module
2019-03-04 13:30:43 +01:00
Laurent Destailleur
1c775b7b68
Work of BOM module
2019-03-04 12:46:07 +01:00
Laurent Destailleur
481d0de010
FIX Import of service was not available in update mode
2019-03-03 13:02:20 +01:00
Frédéric FRANCE
3037e4a157
Update DolibarrModules.class.php
2019-03-02 20:49:53 +01:00
Laurent Destailleur
8fce6e5e31
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/modAgenda.class.php
2019-03-02 19:07:14 +01:00
Laurent Destailleur
8f8aaf1e8c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-02 19:05:51 +01:00
Laurent Destailleur
4f9981063f
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
2019-03-02 18:26:50 +01:00
Laurent Destailleur
5f6ca1119a
Replace arrow picto with fontawesome
2019-03-02 14:07:13 +01:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Frédéric FRANCE
c5c27fdb77
add visibility
2019-03-01 19:24:06 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility
2019-03-01 18:28:51 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +01:00
Frédéric FRANCE
0022c4fe72
add visibility
2019-02-28 22:44:12 +01:00
Frédéric FRANCE
7e31ca48d8
add visibility
2019-02-28 22:07:48 +01:00
Frédéric FRANCE
4f9e35f350
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-28 20:48:23 +01:00
Frédéric FRANCE
92c5c15033
add visibility
2019-02-28 20:48:07 +01:00
Marc de Lima Lucio
b96ac794e9
FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work
2019-02-28 16:15:32 +01:00
Laurent Destailleur
cefaeb583f
Update xinputfile.modules.php
2019-02-28 11:24:43 +01:00
Laurent Destailleur
85d46a5270
Update xinputfile.modules.php
2019-02-28 11:24:07 +01:00
Laurent Destailleur
b8b55fb748
WIP Add IFTTT module
2019-02-28 10:30:27 +01:00
gauthier
1237a6d3e9
FIX : same thing here
2019-02-27 14:58:10 +01:00
gauthier
49e03b009f
FIX : if empty error message, we just see "error" displayed
2019-02-27 14:50:01 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 08:23:29 +01:00
Laurent Destailleur
58e2901d14
Fix phpcs
2019-02-27 00:54:07 +01:00
Frédéric FRANCE
8b4e920d5e
add visibility
2019-02-26 22:42:19 +01:00
Frédéric FRANCE
5016bc7188
wip
2019-02-26 21:48:21 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-26 21:16:01 +01:00
Frédéric FRANCE
e6c3eb0ba1
wip
2019-02-26 21:13:07 +01:00
Laurent Destailleur
9e82c37963
WIP Start module BOM
2019-02-26 19:27:04 +01:00
Laurent Destailleur
3a2a1b4a56
Debug module ticket
2019-02-26 13:43:09 +01:00
Frédéric FRANCE
675a17a74c
wip
2019-02-26 00:34:43 +01:00
Frédéric FRANCE
346d1f410c
wip
2019-02-25 23:15:48 +01:00
Frédéric FRANCE
915841eeb9
wip
2019-02-25 22:50:19 +01:00
Frédéric FRANCE
c89e4d79b8
wip
2019-02-25 22:27:04 +01:00
Frédéric FRANCE
1c07006015
wip
2019-02-25 21:36:27 +01:00
Cristian Torres
c781eeb17d
[FIX] ORDER BY before custom filters for where
...
When filtering data "and cac.libelle" would be appended after ORDER BY
2019-02-24 20:55:27 +01:00
Laurent Destailleur
dfd6a0feaa
Merge pull request #10643 from tony13tv/patch-3
...
[FIX] ORDER BY before custom filters for where
2019-02-24 20:55:01 +01:00
Laurent Destailleur
89087473e1
Merge pull request #10674 from frederic34/patch-4
...
Update printgcp.modules.php
2019-02-24 20:44:08 +01:00
Frédéric FRANCE
e7706192b5
doc comment
2019-02-24 10:08:42 +01:00
Frédéric FRANCE
b51432790f
Update printgcp.modules.php
2019-02-24 09:39:48 +01:00
Frédéric FRANCE
485431a722
Update printgcp.modules.php
2019-02-24 09:31:19 +01:00
Laurent Destailleur
4da1bef6dc
Merge pull request #10654 from ptibogxiv/patch-125
...
FIX Stripe live Oauth
2019-02-23 14:21:25 +01:00
ptibogxiv
dd160a6242
Create stripelive_oauthcallback.php
2019-02-22 14:56:39 +01:00
Philippe GRAND
5a88930062
fix : The property total_vat does not exist on Reception
2019-02-21 14:38:12 +01:00
Cristian Torres
31aa3ec376
[FIX] ORDER BY before custom filters for where
...
When filtering data "and cac.libelle" would be appended after ORDER BY
2019-02-20 11:45:07 -06:00
Regis Houssin
1c3541295b
FIX wrong class name "CUnits instead CMeasuringUnits"
2019-02-19 09:24:30 +01:00
Laurent Destailleur
ebfb6beee3
Merge
2019-02-18 19:14:42 +01:00
Laurent Destailleur
e6e18ff616
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
2019-02-14 15:33:17 +01:00
Laurent Destailleur
89050da856
Merge
2019-02-14 15:27:31 +01:00
Laurent Destailleur
afc612c2cb
Merge pull request #10592 from frederic34/patch-30
...
Update mod_expensereport_sand.php
2019-02-14 13:32:00 +01:00
Laurent Destailleur
418bab3214
Merge pull request #10591 from frederic34/patch-29
...
Update mod_payment_ant.php
2019-02-14 13:31:51 +01:00
Laurent Destailleur
a655481adb
Merge pull request #10590 from frederic34/patch-28
...
Update mod_ticket_universal.php
2019-02-14 13:31:33 +01:00
Laurent Destailleur
cd9bd26267
Merge pull request #10589 from frederic34/patch-27
...
Update mod_facture_mercure.php
2019-02-14 13:31:15 +01:00
Laurent Destailleur
b69a416960
Merge pull request #10588 from frederic34/patch-24
...
Update mod_commande_fournisseur_orchidee.php
2019-02-14 13:29:15 +01:00
Laurent Destailleur
7e4a4c2ae6
Merge pull request #10587 from frederic34/patch-23
...
Update mod_holiday_immaculate.php
2019-02-14 13:28:56 +01:00
Laurent Destailleur
c45ed24342
Merge pull request #10586 from frederic34/patch-22
...
Update modules_holiday.php
2019-02-14 13:28:30 +01:00
Laurent Destailleur
3050366372
Fix table of units already exists. Merge duplicate c_measuring_units
...
with c_units.
2019-02-14 13:02:44 +01:00
Regis Houssin
359318392f
FIX missing entity filter in function "build_filterField()" (export)
2019-02-14 10:47:07 +01:00
Frédéric FRANCE
6276845956
Update mod_expensereport_sand.php
2019-02-13 23:48:44 +01:00
Frédéric FRANCE
1e52ef19a5
Update mod_payment_ant.php
2019-02-13 23:45:28 +01:00
Frédéric FRANCE
423a69ffad
Update mod_ticket_universal.php
2019-02-13 23:44:06 +01:00
Frédéric FRANCE
210fb2eac1
Update mod_facture_mercure.php
2019-02-13 23:41:47 +01:00
Frédéric FRANCE
5c50ea8afe
Update mod_commande_fournisseur_orchidee.php
...
The property db does not exist on mod_commande_fournisseur_orchidee
2019-02-13 23:39:02 +01:00
Frédéric FRANCE
9370c8b3f6
Update mod_holiday_immaculate.php
2019-02-13 23:36:16 +01:00
Frédéric FRANCE
e0843e6130
Update modules_holiday.php
2019-02-13 23:35:44 +01:00
Laurent Destailleur
a689f8dc3f
Code comment
2019-02-13 23:34:28 +01:00
florian HENRY
d88475c61a
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
2019-02-13 08:59:18 +01:00
Laurent Destailleur
0d8447ad39
Merge branch 'develop' of https://github.com/wdammak/dolibarr into
...
wdammak-develop
# Conflicts:
# htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
2019-02-12 16:58:55 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Laurent Destailleur
205152501e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
b1088f556f
Merge pull request #10536 from grandoc/new_branch_09_02_2019
...
language internationalization
2019-02-12 13:28:56 +01:00
Laurent Destailleur
a62bccaf24
Fix phpcs
2019-02-11 19:19:05 +01:00
Laurent Destailleur
f0e56abac7
NEW Module ticket is available as a stable module
2019-02-11 19:16:37 +01:00
Laurent Destailleur
c095f802dd
Dolibarrize module ticket
2019-02-11 14:51:59 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
Philippe Grand
92ec149fb6
Update modules_fichinter.php
2019-02-09 11:05:52 +01:00
Philippe GRAND
869f59de96
language internationalization
2019-02-09 10:56:59 +01:00
Laurent Destailleur
7625eb7cd4
Fix missing error management after afterPDFCreation hook.
...
Removed dead code
2019-02-08 19:54:24 +01:00
Laurent Destailleur
a916708068
Fix missing disable dependency
2019-02-08 19:01:47 +01:00
Laurent Destailleur
ed733fb82d
Fix phpcs
2019-02-08 13:28:10 +01:00
Laurent Destailleur
8760b1e592
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-08 12:57:50 +01:00
Laurent Destailleur
27da574e38
Fix phpcs
2019-02-08 12:36:33 +01:00
Laurent Destailleur
1611c613f5
Fix phpcs
2019-02-08 12:19:51 +01:00
Laurent Destailleur
ec686a8f79
Fix phpcs
2019-02-08 11:30:20 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/filefunc.inc.php
2019-02-08 10:44:45 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite
...
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-08 09:30:25 +01:00
Laurent Destailleur
6a4a92510d
Code comment
2019-02-07 13:32:05 +01:00
atm-ph
8e6a567b09
Fix display payment table on multiple pages
2019-02-07 12:36:22 +01:00
Frédéric FRANCE
e1e14ae6e6
wip
2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00
Laurent Destailleur
4d41b1b33c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 19:45:45 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
f8b10e9c3d
Doxygen
2019-02-03 18:47:55 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found
2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +01:00
Laurent Destailleur
75845a990f
FIX Missing province in export of invoice
2019-02-01 22:55:28 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Laurent Destailleur
6de732d7f8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
2019-02-01 16:05:43 +01:00
Laurent Destailleur
dee2a373c1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2019-02-01 16:01:18 +01:00
Laurent Destailleur
eb3621839a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
Laurent Destailleur
4254ad0d33
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-31 15:51:54 +01:00
Laurent Destailleur
14dea53700
FIX Missing field in import/export of users
2019-01-31 15:51:02 +01:00
gauthier
09ba059c21
FIX : need an order by in case we found other invoice with same number but not same date
2019-01-31 11:03:06 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
97248a830b
FIX #10440
2019-01-30 16:28:37 +01:00
Laurent Destailleur
6d992a6d7b
FIX #10440
2019-01-30 16:24:27 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Laurent Destailleur
c354656b1b
Merge pull request #10449 from ptibogxiv/patch-108
...
NEW : list of stripe's payout
2019-01-30 15:02:27 +01:00
Laurent Destailleur
60fa8d08c2
Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import
...
FIX: FEC Compatibility for import in ledger
2019-01-30 15:01:02 +01:00
Alexandre SPANGARO
84ecfd96fb
Update example
2019-01-30 11:22:01 +01:00
Alexandre SPANGARO
1b675ba0b6
FIX: FEC Compatibility for import in ledger
2019-01-30 09:51:29 +01:00
ptibogxiv
a3b648824a
ADD payout link
2019-01-29 14:12:35 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
77747ac2a3
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-28 16:35:12 +01:00
Frédéric FRANCE
764a928cd6
wip
2019-01-27 23:48:36 +01:00
Frédéric FRANCE
ff39491f15
wip
2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
46bc078481
Fix phpcs
2019-01-27 23:10:10 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
a268a13c89
Merge pull request #10423 from grandoc/new_branch_27_01_2019
...
fix translations
2019-01-27 17:55:05 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Philippe GRAND
b8ec33d29b
fix translations
2019-01-27 17:28:18 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Philippe GRAND
95bbb46fdf
fix translations
2019-01-27 12:20:24 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Philippe GRAND
a6c40dc867
fix translations
2019-01-27 11:37:57 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
51bdf5f949
Fix trans
2019-01-22 16:06:20 +01:00
Laurent Destailleur
d38ed67a3c
Merge pull request #10383 from grandoc/new_branch_21_01_2019
...
update with html5 compliant code
2019-01-21 18:05:40 +01:00
Laurent Destailleur
0cba7e1613
FIX Hide path into exported filename
2019-01-21 14:31:27 +01:00
Laurent Destailleur
0b199f4d28
FIX Hide path into exported filename
2019-01-21 14:31:03 +01:00
Laurent Destailleur
495b04a3c7
FIX Hide path into exported filename
2019-01-21 14:30:50 +01:00
Laurent Destailleur
d5e94c1689
Add phpmin of driver
2019-01-21 14:18:31 +01:00
Laurent Destailleur
5c2b9e3078
NEW Introduce PhpSpreadsheet for export (need php5.6+)
2019-01-21 14:06:01 +01:00
Laurent Destailleur
ecf46903ae
Fix doxygen
2019-01-21 13:24:52 +01:00
Philippe GRAND
cdacfc5f37
update with html5 compliant code
2019-01-21 09:54:59 +01:00
Laurent Destailleur
f53232e2f9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 02:56:32 +01:00
Laurent Destailleur
7f8b710edc
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-21 02:52:24 +01:00
Laurent Destailleur
5ab6c41dfa
Fix missing multicurrency fields in export
2019-01-21 02:43:08 +01:00
Laurent Destailleur
3ddfcbe3bb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
616aa1f81c
Fix var not defined
2019-01-19 17:10:14 +01:00
laurantines
7556ae4988
Update modFacture.class.php
...
Correct double comma (,,)
2019-01-17 11:58:25 +01:00
laurantines
fa598ad941
Update modFacture.class.php
...
Add localtax1 and localtax2 fields in the export of customer invoices to be able to select them in step 2 of the export
2019-01-17 11:31:32 +01:00
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
Laurent Destailleur
724a2f32c3
Move module as experimental
2019-01-10 01:56:33 +01:00
Steve
70c0adc3d1
import.php
...
HTML5 validation
ADDED htmlentities to enclosure and separator
CHANGED td aligns to css, removed nospan tag
ADDED clause to box generator to stop multiple duplicate ids when no $key
REMOVED height attribute
REMOVED nested b tag
CHANGED deprecated Center tag for div style center
FIX
Added check
if ($objimport->array_import_updatekeys[0] && count($objimport->array_import_updatekeys[0]
to stop php warning
------------------
modProduct.class.php
Products Import
ordered fields as per table structure order
ADDED and changed import fields and examples
------------------
modSociete.class.php
Third Party Import
Changed field orders to match table field order so future additions will be easier to manage.
REMOVED s.datec repeated in import example
ADDED: alias, payment mode, payment conditions, sales tax VAT, multicurrency, currency
Additional Address Import
Changed field orders to match table field order
import example csv was missing birthday
Bank Account Import
Changed field orders to match table field order
ADDED label (required for a bank account
ADDED datec (required for d.debit UMR)
ADDED to address import: s.fk_departement
modified text to import example csv
-------------------
companies.lang
various new constants for import file column headers
2018-12-20 16:49:17 +01:00
Laurent Destailleur
44a6644969
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
2018-12-18 21:55:14 +01:00
Laurent Destailleur
4b7f373802
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-12-18 21:37:34 +01:00
Laurent Destailleur
fb8c3f01a4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/modules/project/doc/pdf_baleine.modules.php
htdocs/core/modules/project/doc/pdf_beluga.modules.php
2018-12-18 21:35:30 +01:00
Laurent Destailleur
6851232314
Fix removing constant no more required
2018-12-18 21:29:36 +01:00
Laurent Destailleur
2e6a41228f
Fix removing constant no more required
2018-12-18 20:49:48 +01:00
Laurent Destailleur
65412b77de
Default nb of digits for customer code "monkey" template is on 5 digits.
2018-12-18 20:16:02 +01:00
Laurent Destailleur
6e0df5d3cc
Default nb of digits for customer code "monkey" template is on 5 digits.
2018-12-18 20:14:36 +01:00
Laurent Destailleur
f1451904c0
Fix phpcs
2018-12-16 17:48:02 +01:00
Laurent Destailleur
9ce07b9582
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2018-12-16 15:36:18 +01:00
Laurent Destailleur
e366d7d57c
Work on cash fence
2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae
Clean code of POS modules
2018-12-16 14:59:51 +01:00
Laurent Destailleur
85cd23caaf
Fix phpcs
2018-12-15 18:31:36 +01:00
Laurent Destailleur
54ffba793f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
htdocs/langs/en_US/admin.lang
2018-12-15 18:21:37 +01:00
Laurent Destailleur
db46d82de3
Fix position of menu entries
2018-12-15 15:35:59 +01:00
Laurent Destailleur
2e1b762596
Fix phpcs
2018-12-15 15:07:35 +01:00
Laurent Destailleur
1bce3f6c6b
Fix phpcs
2018-12-15 14:54:10 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
6846d8821d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2018-12-15 14:07:25 +01:00
Laurent Destailleur
dbc85b42ba
Fix phpcs
2018-12-15 13:58:39 +01:00
Laurent Destailleur
c6d76e29f1
Fix phpcs
2018-12-15 13:50:40 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
1971482c24
Merge pull request #10180 from fappels/payments_pdf_expensereport
...
NEW add payments table to pdf of expense report
2018-12-14 17:46:48 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer
...
fix scrunitizer
2018-12-14 17:28:34 +01:00
Laurent Destailleur
b95fa8ad3e
Merge pull request #10038 from aspangaro/10.0_members
...
NEW Add gender in member card
2018-12-14 16:24:00 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members
2018-12-14 11:39:02 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Lionel VESSILLER
1512ba9242
Add contact status in category export
2018-12-12 14:20:04 +01:00
Laurent Destailleur
85af3ad513
NEW Unsubscribed emails are now stored in dedicated table
2018-12-11 10:24:57 +01:00
Laurent Destailleur
5ec9a1ca7f
Remove deprecated parameter
2018-12-11 10:15:13 +01:00
Laurent Destailleur
21b3bbc2e6
Merge
2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:42:30 +01:00
Maxime Kohlhaas
550df138a6
Fix unexistant fields
2018-12-07 12:19:50 +01:00
fappels
6d27a6458e
Fix travis
2018-12-05 11:10:42 +01:00
fappels
d1d41f4dd4
New add payments table to pdf expense report
2018-12-04 23:16:41 +01:00
Laurent Destailleur
f142238817
Fix missing field canvas
2018-12-04 21:25:59 +01:00
Philippe GRAND
e9e6d8b9b5
Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato>
2018-12-04 16:10:56 +01:00
Philippe GRAND
c113a7ca3b
Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato>
2018-12-04 14:04:02 +01:00
