Bernard Saulme
|
be7714be1c
|
Use email model option to joint file for subscription
Allow the adherent subscription to use the email model option to join or no joint file.
|
2020-11-25 18:11:36 +01:00 |
|
Laurent Destailleur
|
74605cec12
|
Fix warning
|
2020-11-25 18:07:52 +01:00 |
|
Laurent Destailleur
|
8ee9e59173
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-11-25 18:04:22 +01:00 |
|
Laurent Destailleur
|
d8bf7b2714
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
|
2020-11-25 18:04:06 +01:00 |
|
Laurent Destailleur
|
ccfb7f8256
|
Merge pull request #15538 from frederic34/patch-8
remove warning
|
2020-11-25 17:47:11 +01:00 |
|
Laurent Destailleur
|
460c5ab6e3
|
Merge pull request #15539 from frederic34/patch-14
remove warning
|
2020-11-25 17:46:30 +01:00 |
|
Laurent Destailleur
|
168e35a035
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-11-25 17:29:09 +01:00 |
|
Laurent Destailleur
|
16e3baeff2
|
FIX filter on project list
|
2020-11-25 17:28:53 +01:00 |
|
Frédéric FRANCE
|
5ff3ab528c
|
remove warning
|
2020-11-25 17:15:06 +01:00 |
|
Frédéric FRANCE
|
7ca1df6d46
|
remove warning
|
2020-11-25 17:12:56 +01:00 |
|
Laurent Destailleur
|
c9371e9eb0
|
Merge pull request #15512 from fappels/12_fix_transfer_expline_extrafield
Fix issue #15506 tansfer line extrafield order to expedition
|
2020-11-25 15:30:07 +01:00 |
|
Laurent Destailleur
|
944e2a8032
|
Fix delete of expense report
|
2020-11-25 15:29:18 +01:00 |
|
Laurent Destailleur
|
54913c6a75
|
Merge pull request #15535 from defrance/patch-162
fix better delete management (include extrafield too)
|
2020-11-25 15:11:57 +01:00 |
|
Laurent Destailleur
|
4d90fb22de
|
Fix sql syntax error
|
2020-11-25 15:07:26 +01:00 |
|
Francis Appels
|
a734e1caa7
|
line is order line not exp line
|
2020-11-25 15:06:07 +01:00 |
|
Laurent Destailleur
|
5030f0c587
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/opensurvey/wizard/create_survey.php
|
2020-11-25 14:55:31 +01:00 |
|
Laurent Destailleur
|
bf7b6ee00d
|
Fix delete of proposal
|
2020-11-25 14:15:59 +01:00 |
|
stickler-ci
|
9da8cf63a2
|
Fixing style errors.
|
2020-11-25 12:07:57 +00:00 |
|
Laurent Destailleur
|
ac859bc38e
|
Merge pull request #15531 from FHenry/develop
Fix bank transfert supplier
|
2020-11-25 13:06:10 +01:00 |
|
BENKE Charlene
|
62c361dc1a
|
fix better delete management (include extrafield too)
|
2020-11-25 13:04:26 +01:00 |
|
Laurent Destailleur
|
4e5e499ddd
|
Merge pull request #15521 from andreubisquerra/develop
Order receipt improvements in TakePOS
|
2020-11-25 13:01:57 +01:00 |
|
Laurent Destailleur
|
3f1c00dcb2
|
Merge pull request #15517 from dumbbell/remove-PCG99-BASE-left-over-fields
Fix #15515: Getting errors when importing the "PCG99-BASE" accounts
|
2020-11-25 12:59:53 +01:00 |
|
Laurent Destailleur
|
f90ba80488
|
Merge pull request #15510 from dolibit-ut/patch-44
Update autotranslator.php
|
2020-11-25 12:57:03 +01:00 |
|
Laurent Destailleur
|
bb765b36aa
|
Merge pull request #15509 from dolibit-ut/patch-43
Update copyright
|
2020-11-25 12:54:32 +01:00 |
|
Laurent Destailleur
|
c22926c35c
|
Merge pull request #15507 from dolibit-ut/patch-42
Update README-FR
|
2020-11-25 12:54:09 +01:00 |
|
Laurent Destailleur
|
42c30584f4
|
Merge pull request #15522 from frederic34/patch-15
Update api_thirdparties.class.php
|
2020-11-25 12:53:36 +01:00 |
|
Laurent Destailleur
|
7bb6b24b96
|
Merge pull request #15505 from ptibogxiv/patch-394
Fix api contact
|
2020-11-25 12:52:45 +01:00 |
|
Laurent Destailleur
|
f754b48478
|
Merge pull request #15520 from frederic34/patch-14
doxygen
|
2020-11-25 12:52:15 +01:00 |
|
Laurent Destailleur
|
e23a23af31
|
Merge pull request #15527 from StephaneLesage/refresh-prospecting-status-after-update
FIX: refresh of prospecting icon/label after modifying status
|
2020-11-25 12:52:00 +01:00 |
|
Laurent Destailleur
|
2a9c061055
|
Merge pull request #15511 from dolibit-ut/patch-45
Update README
|
2020-11-25 12:50:41 +01:00 |
|
Laurent Destailleur
|
87d17e4eb8
|
Merge pull request #15518 from frederic34/patch-8
doxygen
|
2020-11-25 12:49:36 +01:00 |
|
Laurent Destailleur
|
2ac36be531
|
Merge pull request #15514 from frederic34/doxygen
doxygen
|
2020-11-25 12:49:24 +01:00 |
|
Laurent Destailleur
|
cf2276a86c
|
Merge pull request #15529 from FHenry/dev_mass_action_create_supplierwithdraw
fix : finish bank transfert in mass action from supplier invoice list
|
2020-11-25 12:48:45 +01:00 |
|
Laurent Destailleur
|
0ad0035f19
|
Update list.php
|
2020-11-25 12:47:10 +01:00 |
|
Laurent Destailleur
|
4917403365
|
Avoid dynamic var
|
2020-11-25 12:46:03 +01:00 |
|
Laurent Destailleur
|
67a1059d19
|
Merge pull request #15533 from FHenry/dev_fix_survey
fix survey
|
2020-11-25 12:43:22 +01:00 |
|
Laurent Destailleur
|
6e7ff7beeb
|
Merge pull request #15530 from hregis/develop_bug2
FIX missing "price_base_type" and refactor to include cache
|
2020-11-25 12:42:18 +01:00 |
|
Laurent Destailleur
|
0eda49c4ac
|
Merge pull request #15523 from frederic34/patch-18
fix api generateBankAccountDocument
|
2020-11-25 12:37:47 +01:00 |
|
Laurent Destailleur
|
30e5092dc3
|
Merge pull request #15525 from frederic34/patch-19
Update CodingPhpTest.php
|
2020-11-25 12:36:16 +01:00 |
|
Laurent Destailleur
|
dd5c6ebdc5
|
Merge pull request #15534 from FHenry/dev_add_typejuridiq
add SCOP and SCIC in dict form juridique
|
2020-11-25 12:35:53 +01:00 |
|
Florian HENRY
|
e2b96a834d
|
add SCOP and SCIC in ent form juridique
|
2020-11-25 12:11:00 +01:00 |
|
Florian HENRY
|
345b3cbfc8
|
fix survey
|
2020-11-25 11:38:58 +01:00 |
|
Florian HENRY
|
73d6266151
|
continue fix banktransfert supplier
|
2020-11-25 11:22:31 +01:00 |
|
Florian HENRY
|
12ef03f06d
|
fix banck tranfert supplier
|
2020-11-25 10:58:34 +01:00 |
|
stickler-ci
|
89759174dd
|
Fixing style errors.
|
2020-11-25 09:45:04 +00:00 |
|
Regis Houssin
|
a0dcbb3b79
|
FIX missing "price_base_type" and refactor to include cache
|
2020-11-25 10:40:38 +01:00 |
|
stickler-ci
|
bbf1ade0a5
|
Fixing style errors.
|
2020-11-25 09:39:41 +00:00 |
|
Florian HENRY
|
4a316f06d5
|
fix : finish bank transfert fourn from list
|
2020-11-25 10:24:44 +01:00 |
|
Frédéric FRANCE
|
59a2be813e
|
Update CodingPhpTest.php
|
2020-11-25 07:56:10 +01:00 |
|
StephaneLesage
|
2bf44d276b
|
simple & dirty refresh of prospection status icon/label by re-fetching after update
|
2020-11-25 06:35:05 +01:00 |
|