Frédéric FRANCE
cae9ca1bcf
Update .travis.yml
2022-06-09 12:50:35 +02:00
Laurent Destailleur
62d2084237
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-09 12:49:49 +02:00
Laurent Destailleur
974a1c2c6d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-06-09 12:48:51 +02:00
Abdelaziz MISBAH
14e7c5454e
FIX #21141 Update condition to check for attached file to E-mail Template
...
Update condition to check for attached file to E-ail Template, initial Commit doesn't check for if null (may generate fatal error depending on context), now we check if is an object, before checking if we join files.
2022-06-09 11:47:34 +01:00
Laurent Destailleur
a4ca81d4ce
FIX #21174
2022-06-09 12:46:13 +02:00
Laurent Destailleur
a0ad3552c1
Merge pull request #21177 from frederic34/patch-4
...
avoid extra space after idprof
2022-06-09 12:17:05 +02:00
stickler-ci
fb86cea3fc
Fixing style errors.
2022-06-09 10:09:49 +00:00
Laurent Destailleur
3bb8e9cdda
Debug v16
2022-06-09 12:07:35 +02:00
NASDAMI Quatadah
8a48cd5989
Fixing bug
2022-06-09 12:05:23 +02:00
Frédéric FRANCE
70af9b548f
avoid extra space after idprof
2022-06-09 12:04:35 +02:00
Frédéric FRANCE
33f10c3aeb
Update .travis.yml
2022-06-09 11:59:19 +02:00
Frédéric FRANCE
003713953c
Update .travis.yml
2022-06-09 11:17:21 +02:00
Laurent Destailleur
0104f00a7a
Debug v16
2022-06-09 11:12:45 +02:00
Frédéric FRANCE
89d0a57eab
add var_dump check
2022-06-09 11:12:17 +02:00
Laurent Destailleur
7a7d296533
Fix fatal error on canvas
2022-06-09 10:49:24 +02:00
Laurent Destailleur
33c2684ce2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-09 03:25:27 +02:00
Laurent Destailleur
2b9dbe4c98
Doc
2022-06-09 03:21:31 +02:00
Laurent Destailleur
99642b1b8b
Merge pull request #21169 from BoFFire/develop
...
Fixing algerian provinces names
2022-06-09 03:16:30 +02:00
Laurent Destailleur
f5c17f8ac3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-09 03:13:38 +02:00
Laurent Destailleur
aeb4287d25
Merge pull request #21143 from fboitel/14.0
...
FIX #20696
2022-06-09 03:11:23 +02:00
Laurent Destailleur
1ae708ae9a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-09 03:10:37 +02:00
Laurent Destailleur
8280447f3e
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-09 03:09:37 +02:00
Laurent Destailleur
900c71b5d6
Fix can add an empty line in tmp edit mode of transation
2022-06-09 03:07:11 +02:00
Laurent Destailleur
e10d89dd36
Fix regression
2022-06-09 03:00:51 +02:00
Laurent Destailleur
9c71ae5f0c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-09 02:59:10 +02:00
Laurent Destailleur
5fec04e3ae
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2022-06-09 02:58:44 +02:00
bagtaib
7a20b3dcec
FIX #21140
...
Conflicts:
htdocs/societe/class/societe.class.php
2022-06-09 02:52:54 +02:00
Laurent Destailleur
9780c45cc5
Merge pull request #21167 from badre-agtaib/dev1
...
FIX #21140
2022-06-09 02:50:16 +02:00
Laurent Destailleur
98ec208449
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-09 02:48:50 +02:00
Laurent Destailleur
74104285db
Debug v16
2022-06-09 02:48:32 +02:00
Laurent Destailleur
bbf9f1bc29
Merge pull request #21170 from fappels/15_fix_reception_stock_move
...
FIX Stock movements on reception.
2022-06-09 02:43:05 +02:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move
2022-06-09 02:41:51 +02:00
Laurent Destailleur
503d1a04bf
Merge pull request #21171 from SylvainLegrand/Fix_Supplier_deposit_can_not_be_used_to_pay_supplier_invoice
...
Fixed an error when a supplier deposit is used to pay the supplier invoice
2022-06-09 02:17:52 +02:00
Laurent Destailleur
f0c8694119
Merge branch 'develop' into Fix_Supplier_deposit_can_not_be_used_to_pay_supplier_invoice
2022-06-09 02:17:43 +02:00
Laurent Destailleur
604855bbc1
Debug v16
2022-06-09 02:05:20 +02:00
Sylvain Legrand
ab3f19dd59
Fix error when supplier deposit are used to pay supplier invoice
2022-06-08 22:07:48 +02:00
Laurent Destailleur
97f50ba364
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-08 21:20:21 +02:00
Laurent Destailleur
1838baaa5c
Debug v16
2022-06-08 21:20:12 +02:00
Laurent Destailleur
54019b7d76
Debug v16
2022-06-08 21:10:14 +02:00
Francis Appels
e1f4d99aa6
Debug #18770 edit buy price for WAP update.
2022-06-08 18:27:47 +02:00
Laurent Destailleur
41683b9025
Typo
2022-06-08 18:09:21 +02:00
Laurent Destailleur
36e5e8850e
typo
2022-06-08 17:43:33 +02:00
Francis Appels
48142c69bd
Fix reception re-open with stock rule enabled.
2022-06-08 17:29:40 +02:00
Francis Appels
636d594301
Fix reception set-draft with stock rule enabled.
2022-06-08 17:29:22 +02:00
Laurent Destailleur
1f26dee554
Fix deprecated functions
2022-06-08 17:19:12 +02:00
ButterflyOfFire
6f40c002b7
Fixing algerian provinces names
...
Fixing the names of the algerian provinces by removing the "Wilaya de xxx" and adding 10 more new provinces as Algeria has now 58 provinces instead of 48. And more fixes to come.
2022-06-08 16:13:52 +01:00
BENKE Charlene
4d327dcc18
datee and dateo not filled
...
now we user date_end and date_start
2022-06-08 17:00:04 +02:00
Faustin
f0a8765ee6
FIX #20696
2022-06-08 16:05:44 +02:00
bagtaib
cde67b0d65
FIX #21140
2022-06-08 15:35:07 +02:00
Laurent Destailleur
604463c9a4
Merge pull request #21142 from FHenry/dev_21139
...
fix : #21139
2022-06-08 15:09:36 +02:00
